Browse Source

tdb: 64-bit fixes.

Rusty Russell 15 years ago
parent
commit
e93f843173
3 changed files with 3 additions and 3 deletions
  1. 1 1
      ccan/tdb/summary.c
  2. 1 1
      ccan/tdb/tdb_private.h
  3. 1 1
      ccan/tdb/test/logging.c

+ 1 - 1
ccan/tdb/summary.c

@@ -19,7 +19,7 @@
 #include <ccan/tally/tally.h>
 #include <ccan/tally/tally.h>
 
 
 #define SUMMARY_FORMAT \
 #define SUMMARY_FORMAT \
-	"Size of file/data: %zu/%zu\n" \
+	"Size of file/data: %u/%zu\n" \
 	"Number of records: %zu\n" \
 	"Number of records: %zu\n" \
 	"Smallest/average/largest keys: %zu/%zu/%zu\n%s" \
 	"Smallest/average/largest keys: %zu/%zu/%zu\n%s" \
 	"Smallest/average/largest data: %zu/%zu/%zu\n%s" \
 	"Smallest/average/largest data: %zu/%zu/%zu\n%s" \

+ 1 - 1
ccan/tdb/tdb_private.h

@@ -72,7 +72,7 @@ typedef uint32_t tdb_len_t;
 typedef uint32_t tdb_off_t;
 typedef uint32_t tdb_off_t;
 
 
 #ifndef offsetof
 #ifndef offsetof
-#define offsetof(t,f) ((unsigned int)&((t *)0)->f)
+#define offsetof(t,f) ((size_t)&((t *)0)->f)
 #endif
 #endif
 
 
 #define TDB_MAGIC_FOOD "TDB file\n"
 #define TDB_MAGIC_FOOD "TDB file\n"

+ 1 - 1
ccan/tdb/test/logging.c

@@ -25,7 +25,7 @@ static void taplog(struct tdb_context *tdb,
 
 
 	/* Strip trailing \n: diag adds it. */
 	/* Strip trailing \n: diag adds it. */
 	if (line[0] && line[strlen(line)-1] == '\n')
 	if (line[0] && line[strlen(line)-1] == '\n')
-		diag("%s%.*s", log_prefix, strlen(line)-1, line);
+		diag("%s%.*s", log_prefix, (unsigned)strlen(line)-1, line);
 	else
 	else
 		diag("%s%s", log_prefix, line);
 		diag("%s%s", log_prefix, line);
 }
 }