X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=dss.c;h=c2aef361287fef0d9a2aafcf787a96ae24f9d37f;hb=56f81b0dfa62bb5bf2c338733d9370a8b11bfc39;hp=1d7f7fbdaf0115af5cbf9e43901cd0122c74fbb7;hpb=45ae697d187c12a7ed40ae71b6a8adeda4b32b6c;p=dss.git diff --git a/dss.c b/dss.c index 1d7f7fb..c2aef36 100644 --- a/dss.c +++ b/dss.c @@ -81,7 +81,7 @@ static int64_t next_snapshot_time; static struct timeval next_removal_check; /** Creation time of the snapshot currently being created. */ static int64_t current_snapshot_creation_time; -/** The snapshot currently being removed. */ +/* Set by the pre-rm hook, cleared by handle_remove_exit(). */ struct snapshot *snapshot_currently_being_removed; /** Needed by the post-create hook. */ static char *path_to_last_complete_snapshot; @@ -158,7 +158,7 @@ static void dump_dss_config(const char *msg) fprintf(log, "\n*** internal state ***\n\n"); fprintf(log, "pid: %d\n" - "logile: %s\n" + "logfile: %s\n" "snapshot_currently_being_removed: %s\n" "path_to_last_complete_snapshot: %s\n" "reference_snapshot: %s\n" @@ -1778,7 +1778,7 @@ static void handle_version_and_help(void) else if (OPT_GIVEN(DSS, HELP)) txt = lls_short_help(CMD_PTR(DSS)); else if (OPT_GIVEN(DSS, VERSION)) - txt = dss_strdup(VERSION_STRING); + txt = make_message("%s\n", VERSION_STRING); else return; printf("%s", txt);