diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2016-03-17 21:55:12 +0000 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2016-03-17 22:00:54 +0000 |
| commit | d15ab96a51287469082e8d9068e2608a386f9e5f (patch) | |
| tree | 346fb22044567be929d9f0dc47f62732f4633815 /image | |
| parent | 232cda5317ae39d54852f741fbbd09c9618143cd (diff) | |
| download | netsurf-d15ab96a51287469082e8d9068e2608a386f9e5f.tar.gz netsurf-d15ab96a51287469082e8d9068e2608a386f9e5f.tar.bz2 | |
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.
Diffstat (limited to 'image')
| -rw-r--r-- | image/image_cache.c | 20 | ||||
| -rw-r--r-- | image/png.c | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/image/image_cache.c b/image/image_cache.c index 046a399ed..13ec3b97b 100644 --- a/image/image_cache.c +++ b/image/image_cache.c @@ -374,7 +374,7 @@ image_cache_init(const struct image_cache_parameters *image_cache_parameters) image_cache__background_update, image_cache); - LOG("Image cache initilised with a limit of %zd hysteresis of %zd", + LOG("Image cache initilised with a limit of %" PRIsizet " hysteresis of %"PRIsizet, image_cache->params.limit, image_cache->params.hysteresis); return NSERROR_OK; @@ -387,7 +387,7 @@ nserror image_cache_fini(void) guit->browser->schedule(-1, image_cache__background_update, image_cache); - LOG("Size at finish %zd (in %d)", + LOG("Size at finish %" PRIsizet " (in %d)", image_cache->total_bitmap_size, image_cache->bitmap_count); while (image_cache->entries != NULL) { @@ -399,9 +399,9 @@ nserror image_cache_fini(void) image_cache->fail_count; LOG("Age %ds", image_cache->current_age / 1000); - LOG("Peak size %zd (in %d)", + LOG("Peak size %" PRIsizet " (in %d)", image_cache->max_bitmap_size, image_cache->max_bitmap_size_count); - LOG("Peak image count %d (size %zd)", + LOG("Peak image count %d (size %" PRIsizet ")", image_cache->max_bitmap_count, image_cache->max_bitmap_count_size); if (op_count > 0) { @@ -570,15 +570,15 @@ case chr : \ slen++; break; - FMTCHR('a', SSIZET_FMT, params.limit); - FMTCHR('b', SSIZET_FMT, params.hysteresis); - FMTCHR('c', SSIZET_FMT, total_bitmap_size); + FMTCHR('a', PRIssizet, params.limit); + FMTCHR('b', PRIssizet, params.hysteresis); + FMTCHR('c', PRIssizet, total_bitmap_size); FMTCHR('d', "d", bitmap_count); FMTCHR('e', "d", current_age / 1000); - FMTCHR('f', SSIZET_FMT, max_bitmap_size); + FMTCHR('f', PRIssizet, max_bitmap_size); FMTCHR('g', "d", max_bitmap_size_count); FMTCHR('h', "d", max_bitmap_count); - FMTCHR('i', SSIZET_FMT, max_bitmap_count_size); + FMTCHR('i', PRIssizet, max_bitmap_count_size); case 'j': @@ -705,7 +705,7 @@ int image_cache_snentryf(char *string, size_t size, unsigned int entryn, if (centry->bitmap != NULL) { slen += snprintf(string + slen, size - slen, - "%"SSIZET_FMT, + "%" PRIssizet, centry->bitmap_size); } else { slen += snprintf(string + slen, diff --git a/image/png.c b/image/png.c index 5d68d2f8a..934252b7a 100644 --- a/image/png.c +++ b/image/png.c @@ -172,7 +172,10 @@ static void info_callback(png_structp png_s, png_infop info) png_c->rowbytes = png_get_rowbytes(png_s, info); png_c->interlace = (interlace == PNG_INTERLACE_ADAM7); - LOG("size %li * %li, rowbytes %zu", (unsigned long)width, (unsigned long)height, png_c->rowbytes); + LOG("size %li * %li, rowbytes %" PRIsizet, + (unsigned long)width, + (unsigned long)height, + png_c->rowbytes); } static void row_callback(png_structp png_s, png_bytep new_row, |