From d15ab96a51287469082e8d9068e2608a386f9e5f Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Thu, 17 Mar 2016 21:55:12 +0000 Subject: Fix size_t printf formatting The printf formatting for size_t is set in c99 as %zu but in windows it is %Iu this is solved by adding and inttypes style PRI macro for size_t This also uses this macro everywhere size_t is formatted. --- content/llcache.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'content/llcache.c') diff --git a/content/llcache.c b/content/llcache.c index 9745734f4..6e8b4017f 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -1239,7 +1239,7 @@ llcache_serialise_metadata(llcache_object *object, datasize -= use; /* object size */ - use = snprintf(op, datasize, "%zu", object->source_len); + use = snprintf(op, datasize, "%" PRIsizet, object->source_len); if (use < 0) { goto operror; } @@ -1274,7 +1274,7 @@ llcache_serialise_metadata(llcache_object *object, datasize -= use; /* number of headers */ - use = snprintf(op, datasize, "%zu", object->num_headers); + use = snprintf(op, datasize, "%" PRIsizet, object->num_headers); if (use < 0) { goto operror; } @@ -1386,7 +1386,8 @@ llcache_process_metadata(llcache_object *object) * by simply skipping caching of this object. */ - LOG("Got metadata for %s instead of %s", nsurl_access(metadataurl), nsurl_access(object->url)); + LOG("Got metadata for %s instead of %s", + nsurl_access(metadataurl), nsurl_access(object->url)); nsurl_unref(metadataurl); @@ -1402,7 +1403,7 @@ llcache_process_metadata(llcache_object *object) ln += lnsize + 1; lnsize = strlen(ln); - if ((lnsize < 1) || (sscanf(ln, "%zu", &source_length) != 1)) { + if ((lnsize < 1) || (sscanf(ln, "%" PRIsizet, &source_length) != 1)) { res = NSERROR_INVALID; goto format_error; } @@ -1443,7 +1444,7 @@ llcache_process_metadata(llcache_object *object) ln += lnsize + 1; lnsize = strlen(ln); - if ((lnsize < 1) || (sscanf(ln, "%zu", &num_headers) != 1)) { + if ((lnsize < 1) || (sscanf(ln, "%" PRIsizet, &num_headers) != 1)) { res = NSERROR_INVALID; goto format_error; } @@ -2461,7 +2462,7 @@ static void llcache_persist_slowcheck(void *p) total_bandwidth = (llcache->total_written * 1000) / llcache->total_elapsed; if (total_bandwidth < llcache->minimum_bandwidth) { - LOG("Current bandwidth %"PRIu64" less than minimum %zd", + LOG("Current bandwidth %" PRIu64 " less than minimum %" PRIsizet, total_bandwidth, llcache->minimum_bandwidth); guit->llcache->finalise(); } -- cgit v1.2.3