Changeset: 05b23552ebfa for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=05b23552ebfa
Modified Files:
tools/mserver/shutdowntest.c
Branch: default
Log Message:
Just use fprintf/exit in main program instead of GDKfatal.
diffs (55 lines):
diff --git a/tools/mserver/shutdowntest.c b/tools/mserver/shutdowntest.c
--- a/tools/mserver/shutdowntest.c
+++ b/tools/mserver/shutdowntest.c
@@ -223,25 +223,25 @@ static str monetdb_initialize(void) {
snprintf(secret, sizeof(secret), "%s",
"Xas632jsi2whjds8");
} else {
if ((secretf = fopen(GDKgetenv("monet_vault_key"),
"r")) == NULL) {
- snprintf(secret, sizeof(secret),
- "unable to open vault_key_file
%s: %s",
- GDKgetenv("monet_vault_key"),
strerror(errno));
+ fprintf(stderr,
+ "unable to open vault_key_file %s:
%s\n",
+ GDKgetenv("monet_vault_key"),
strerror(errno));
/* don't show this as a crash */
err = msab_registerStop();
if (err)
free(err);
- GDKfatal("%s", secret);
+ exit(1);
}
len = fread(secret, 1, sizeof(secret), secretf);
secret[len] = '\0';
len = strlen(secret); /* secret can contain null-bytes
*/
if (len == 0) {
- snprintf(secret, sizeof(secret), "vault key has
zero-length!");
+ fprintf(stderr, "vault key has zero-length!\n");
/* don't show this as a crash */
err = msab_registerStop();
if (err)
free(err);
- GDKfatal("%s", secret);
+ exit(1);
} else if (len < 5) {
fprintf(stderr, "#warning: your vault key is
too short "
"(%zu), enlarge
your vault key!\n", len);
@@ -253,7 +253,8 @@ static str monetdb_initialize(void) {
err = msab_registerStop();
if (err)
free(err);
- GDKfatal("%s", retval);
+ fprintf(stderr, "%s\n", retval);
+ exit(1);
}
}
/* make sure the authorisation BATs are loaded */
@@ -262,7 +263,8 @@ static str monetdb_initialize(void) {
err = msab_registerStop();
if (err)
free(err);
- GDKfatal("%s", retval);
+ fprintf(stderr, "%s\n", retval);
+ exit(1);
}
if (mal_init() != 0) { // mal_init() does not return meaningful codes
on failure
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
