diff options
| -rw-r--r-- | content/handlers/image/image_cache.c | 12 | ||||
| -rw-r--r-- | content/llcache.c | 10 | ||||
| -rw-r--r-- | include/netsurf/inttypes.h | 5 |
3 files changed, 16 insertions, 11 deletions
diff --git a/content/handlers/image/image_cache.c b/content/handlers/image/image_cache.c index bc0b91408..6ce6b5234 100644 --- a/content/handlers/image/image_cache.c +++ b/content/handlers/image/image_cache.c @@ -632,15 +632,15 @@ case chr : \ slen++; break; - FMTCHR('a', PRIssizet, params.limit); - FMTCHR('b', PRIssizet, params.hysteresis); - FMTCHR('c', PRIssizet, total_bitmap_size); + FMTCHR('a', PRIsizet, params.limit); + FMTCHR('b', PRIsizet, params.hysteresis); + FMTCHR('c', PRIsizet, total_bitmap_size); FMTCHR('d', "d", bitmap_count); FMTCHR('e', "u", current_age / 1000); - FMTCHR('f', PRIssizet, max_bitmap_size); + FMTCHR('f', PRIsizet, max_bitmap_size); FMTCHR('g', "d", max_bitmap_size_count); FMTCHR('h', "d", max_bitmap_count); - FMTCHR('i', PRIssizet, max_bitmap_count_size); + FMTCHR('i', PRIsizet, max_bitmap_count_size); case 'j': @@ -770,7 +770,7 @@ image_cache_snentryf(char *string, if (centry->bitmap != NULL) { slen += snprintf(string + slen, size - slen, - "%" PRIssizet, + "%" PRIsizet, centry->bitmap_size); } else { slen += snprintf(string + slen, 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, diff --git a/include/netsurf/inttypes.h b/include/netsurf/inttypes.h index 3a16d0ef1..e2229085a 100644 --- a/include/netsurf/inttypes.h +++ b/include/netsurf/inttypes.h @@ -52,8 +52,13 @@ /** c99 standard printf formatting for size_t type */ #define PRIsizet "zu" +#if defined(__riscos__) +/** riscos/unixlib defines ssize_t as a long int */ +#define PRIssizet "ld" +#else /** c99 standard printf formatting for ssize_t type */ #define PRIssizet "zd" +#endif #endif |