From 69adc31d07f3b5b9cdfa1482efc00d18f4c21583 Mon Sep 17 00:00:00 2001 From: John-Mark Bell Date: Fri, 3 Jun 2022 02:34:22 +0100 Subject: inttypes: custom format for UnixLib ssize_t UnixLib defines ssize_t to be a long int, which forces the corresponding format string to need to be %ld to avoid compiler warnings. Making this change uncovered a number of places where we were using the wrong format specifier entirely (namely PRIssizet where we meant PRIsizet). Fix these, too. --- content/llcache.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'content/llcache.c') diff --git a/content/llcache.c b/content/llcache.c index 81e08383c..7db59de0a 100644 --- a/content/llcache.c +++ b/content/llcache.c @@ -2966,7 +2966,7 @@ static void llcache_persist(void *p) total_bandwidth = (total_written * 1000) / total_elapsed; NSLOG(llcache, DEBUG, - "Wrote %"PRIssizet" bytes in %lums bw:%lu %s", + "Wrote %"PRIsizet" bytes in %lums bw:%lu %s", written, elapsed, (written * 1000) / elapsed, nsurl_access(lst[idx]->url) ); @@ -3034,7 +3034,7 @@ static void llcache_persist(void *p) llcache->total_elapsed += total_elapsed; NSLOG(llcache, DEBUG, - "writeout size:%"PRIssizet" time:%lu bandwidth:%lubytes/s", + "writeout size:%"PRIsizet" time:%lu bandwidth:%lubytes/s", total_written, total_elapsed, total_bandwidth); NSLOG(llcache, DEBUG, "Rescheduling writeout in %dms", next); @@ -3813,7 +3813,7 @@ void llcache_clean(bool purge) llcache_size -= object->source_len; NSLOG(llcache, DEBUG, - "Freeing source data for %p len:%"PRIssizet, + "Freeing source data for %p len:%"PRIsizet, object, object->source_len); } } @@ -3832,7 +3832,7 @@ void llcache_clean(bool purge) (object->store_state == LLCACHE_STATE_DISC) && (object->source_data == NULL)) { NSLOG(llcache, DEBUG, - "discarding backed object len:%"PRIssizet" age:%ld (%p) %s", + "discarding backed object len:%"PRIsizet" age:%ld (%p) %s", object->source_len, (long)(time(NULL) - object->last_used), object, @@ -3862,7 +3862,7 @@ void llcache_clean(bool purge) (object->fetch.fetch == NULL) && (object->store_state == LLCACHE_STATE_RAM)) { NSLOG(llcache, DEBUG, - "discarding fresh object len:%"PRIssizet" age:%ld (%p) %s", + "discarding fresh object len:%"PRIsizet" age:%ld (%p) %s", object->source_len, (long)(time(NULL) - object->last_used), object, -- cgit v1.2.3