From 5f1defd4a7700f8f39f8b30c25fada31c8bb1b71 Mon Sep 17 00:00:00 2001 From: Vincent Sanders Date: Sat, 18 Aug 2018 23:44:15 +0100 Subject: fix size_t format specifiers --- content/handlers/html/layout.c | 7 ++++--- content/llcache.c | 22 ++++++++++++---------- 2 files changed, 16 insertions(+), 13 deletions(-) (limited to 'content') diff --git a/content/handlers/html/layout.c b/content/handlers/html/layout.c index ee1212861..d52dbf8eb 100644 --- a/content/handlers/html/layout.c +++ b/content/handlers/html/layout.c @@ -3617,8 +3617,8 @@ layout_line(struct box *first, NSLOG(layout, DEBUG, - "splitting: split_box %p \"%.*s\", spilt %zu, w %i, " - "left %p, right %p, inline_count %u", + "splitting: split_box %p \"%.*s\", spilt %"PRIsizet + ", w %i, left %p, right %p, inline_count %u", split_box, (int)split_box->length, split_box->text, @@ -3689,7 +3689,8 @@ layout_line(struct box *first, /* fit as many words as possible */ assert(split != 0); - NSLOG(layout, DEBUG, "'%.*s' %i %zu %i", + NSLOG(layout, DEBUG, + "'%.*s' %i %"PRIsizet" %i", (int)split_box->length, split_box->text, x1 - x0, split, w); diff --git a/content/llcache.c b/content/llcache.c index 84f202abe..5aa8a9a29 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -2696,9 +2696,10 @@ static void llcache_persist(void *p) total_elapsed += elapsed; total_bandwidth = (total_written * 1000) / total_elapsed; - NSLOG(llcache, DEBUG, "Wrote %zd bytes in %lums bw:%lu %s", - written, elapsed, (written * 1000) / elapsed, - nsurl_access(lst[idx]->url) ); + NSLOG(llcache, DEBUG, + "Wrote %"PRIssizet" bytes in %lums bw:%lu %s", + written, elapsed, (written * 1000) / elapsed, + nsurl_access(lst[idx]->url) ); /* check to for the time quantum or the size * (bandwidth) for this run being exceeded. @@ -2763,8 +2764,9 @@ static void llcache_persist(void *p) llcache->total_written += total_written; llcache->total_elapsed += total_elapsed; - NSLOG(llcache, DEBUG, "writeout size:%zd time:%lu bandwidth:%lubytes/s", - total_written, total_elapsed, total_bandwidth); + NSLOG(llcache, DEBUG, + "writeout size:%"PRIssizet" time:%lu bandwidth:%lubytes/s", + total_written, total_elapsed, total_bandwidth); NSLOG(llcache, DEBUG, "Rescheduling writeout in %dms", next); guit->misc->schedule(next, llcache_persist, NULL); @@ -3431,9 +3433,9 @@ void llcache_clean(bool purge) llcache_size -= object->source_len; - NSLOG(llcache, DEBUG, "Freeing source data for %p len:%zd", - object, - object->source_len); + NSLOG(llcache, DEBUG, + "Freeing source data for %p len:%"PRIssizet, + object, object->source_len); } } @@ -3452,7 +3454,7 @@ void llcache_clean(bool purge) (object->store_state == LLCACHE_STATE_DISC) && (object->source_data == NULL)) { NSLOG(llcache, DEBUG, - "discarding backed object len:%zd age:%ld (%p) %s", + "discarding backed object len:%"PRIssizet" age:%ld (%p) %s", object->source_len, (long)(time(NULL) - object->last_used), object, @@ -3483,7 +3485,7 @@ void llcache_clean(bool purge) (object->fetch.outstanding_query == false) && (object->store_state == LLCACHE_STATE_RAM)) { NSLOG(llcache, DEBUG, - "discarding fresh object len:%zd age:%ld (%p) %s", + "discarding fresh object len:%"PRIssizet" age:%ld (%p) %s", object->source_len, (long)(time(NULL) - object->last_used), object, -- cgit v1.2.3