From 0b40ef655ce4cda65d2630b9ad0abd30f2f3cf33 Mon Sep 17 00:00:00 2001 From: Jeremy Lakeman Date: Thu, 15 Aug 2013 15:48:15 +0930 Subject: [PATCH] Log format warnings for strbuf_sprintf --- log.c | 2 +- rhizome_fetch.c | 2 +- strbuf.h | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/log.c b/log.c index 3e5a8f2c..bb246c45 100644 --- a/log.c +++ b/log.c @@ -726,7 +726,7 @@ int logDump(int level, struct __sourceloc whence, char *name, const unsigned cha logMessage(level, whence, "Dump of %s", name); for(i = 0; i < len; i += 16) { strbuf b = strbuf_local(buf, sizeof buf); - strbuf_sprintf(b, " %04x :", i); + strbuf_sprintf(b, " %04zx :", i); int j; for (j = 0; j < 16 && i + j < len; j++) strbuf_sprintf(b, " %02x", addr[i + j]); diff --git a/rhizome_fetch.c b/rhizome_fetch.c index 2a764e44..27471599 100644 --- a/rhizome_fetch.c +++ b/rhizome_fetch.c @@ -168,7 +168,7 @@ int rhizome_fetch_status_html(struct strbuf *b) struct rhizome_fetch_queue *q=&rhizome_fetch_queues[i]; strbuf_sprintf(b, "

Slot %d, ", i); if (q->active.state!=RHIZOME_FETCH_FREE){ - strbuf_sprintf(b, "%lld of %lld", + strbuf_sprintf(b, "%"PRId64" of %"PRId64, q->active.write_state.file_offset, q->active.manifest->fileLength); }else{ diff --git a/strbuf.h b/strbuf.h index c6a0c7a3..234285ac 100644 --- a/strbuf.h +++ b/strbuf.h @@ -314,7 +314,8 @@ strbuf strbuf_putc(strbuf sb, char ch); * * @author Andrew Bettison */ -int strbuf_sprintf(strbuf sb, const char *fmt, ...); +int strbuf_sprintf(strbuf sb, const char *fmt, ...) +__attribute__ (( format(printf,2,3) )); int strbuf_vsprintf(strbuf sb, const char *fmt, va_list ap);