X-Git-Url: http://git.tuebingen.mpg.de/?p=dss.git;a=blobdiff_plain;f=snap.c;h=1fab237a58462d47aaaebddb27b297526ff9fb4b;hp=c47e688f19f928d80f5c5e6a06d2cfaa92745bbf;hb=442d1920cb866fb6e0a816d7e175b5cdb8c0e1a8;hpb=952745a3f7cc03b9581454d1c32f735b8ad16f93

diff --git a/snap.c b/snap.c
index c47e688..1fab237 100644
--- a/snap.c
+++ b/snap.c
@@ -11,6 +11,7 @@
 #include <stdio.h>
 #include <errno.h>
 #include <time.h>
+#include <sys/time.h>
 
 #include "gcc-compat.h"
 #include "error.h"
@@ -100,7 +101,7 @@ static int is_snapshot(const char *dirname, int64_t now, int unit_interval,
 	free(tmp);
 	if (ret < 0)
 		return 0;
-	if (num > now)
+	if (num > now || num < s->creation_time)
 		return 0;
 	s->completion_time = num;
 	s->flags = SS_COMPLETE;
@@ -187,17 +188,15 @@ void free_snapshot_list(struct snapshot_list *sl)
 
 __malloc char *incomplete_name(int64_t start)
 {
-	return make_message("%lli-incomplete", (long long)start);
+	return make_message("%" PRId64 "-incomplete", start);
 }
 
 __malloc char *being_deleted_name(struct snapshot *s)
 {
 	if (s->flags & SS_COMPLETE)
-		return make_message("%lli-%lli.being_deleted",
-			(long long)s->creation_time,
-			(long long)s->completion_time);
-	return make_message("%lli-incomplete.being_deleted",
-		(long long)s->creation_time);
+		return make_message("%" PRId64 "-%" PRId64 ".being_deleted",
+			s->creation_time, s->completion_time);
+	return make_message("%" PRId64 "-incomplete.being_deleted", s->creation_time);
 }
 
 int complete_name(int64_t start, int64_t end, char **result)
@@ -215,7 +214,7 @@ int complete_name(int64_t start, int64_t end, char **result)
 		return -E_STRFTIME;
 	if (!strftime(end_str, sizeof(end_str), "%a_%b_%d_%Y_%H_%M_%S", &end_tm))
 		return -E_STRFTIME;
-	*result = make_message("%lli-%lli.%s-%s", (long long) start, (long long) end,
+	*result = make_message("%" PRId64 "-%" PRId64 ".%s-%s", start, end,
 		start_str, end_str);
 	return 1;
 }