From e93f84317390c2c5ff6f960ebba255d118ff497f Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 20 Oct 2010 12:58:20 +1030 Subject: [PATCH] tdb: 64-bit fixes. --- ccan/tdb/summary.c | 2 +- ccan/tdb/tdb_private.h | 2 +- ccan/tdb/test/logging.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ccan/tdb/summary.c b/ccan/tdb/summary.c index a8f2b71b..3404a414 100644 --- a/ccan/tdb/summary.c +++ b/ccan/tdb/summary.c @@ -19,7 +19,7 @@ #include #define SUMMARY_FORMAT \ - "Size of file/data: %zu/%zu\n" \ + "Size of file/data: %u/%zu\n" \ "Number of records: %zu\n" \ "Smallest/average/largest keys: %zu/%zu/%zu\n%s" \ "Smallest/average/largest data: %zu/%zu/%zu\n%s" \ diff --git a/ccan/tdb/tdb_private.h b/ccan/tdb/tdb_private.h index 1fdf2c6a..7482c84f 100644 --- a/ccan/tdb/tdb_private.h +++ b/ccan/tdb/tdb_private.h @@ -72,7 +72,7 @@ typedef uint32_t tdb_len_t; typedef uint32_t tdb_off_t; #ifndef offsetof -#define offsetof(t,f) ((unsigned int)&((t *)0)->f) +#define offsetof(t,f) ((size_t)&((t *)0)->f) #endif #define TDB_MAGIC_FOOD "TDB file\n" diff --git a/ccan/tdb/test/logging.c b/ccan/tdb/test/logging.c index fa413f63..ae598a98 100644 --- a/ccan/tdb/test/logging.c +++ b/ccan/tdb/test/logging.c @@ -25,7 +25,7 @@ static void taplog(struct tdb_context *tdb, /* Strip trailing \n: diag adds it. */ 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 diag("%s%s", log_prefix, line); } -- 2.39.2