diff options
Diffstat (limited to 'source/fitz')
| -rw-r--r-- | source/fitz/bidi-std.c | 2 | ||||
| -rw-r--r-- | source/fitz/draw-glyph.c | 4 | ||||
| -rw-r--r-- | source/fitz/memory.c | 20 | ||||
| -rw-r--r-- | source/fitz/store.c | 8 |
4 files changed, 17 insertions, 17 deletions
diff --git a/source/fitz/bidi-std.c b/source/fitz/bidi-std.c index 051b07e8..b56c0a8e 100644 --- a/source/fitz/bidi-std.c +++ b/source/fitz/bidi-std.c @@ -720,7 +720,7 @@ void fz_bidi_resolve_weak(fz_context *ctx, fz_bidi_level baselevel, fz_bidi_char for (ich = 0; ich < cch; ich++) { if (pcls[ich] > BDI_BN) { - fz_warn(ctx, "error: pcls[" FMT_zu "] > BN (%d)\n", ich, pcls[ich]); + fz_warn(ctx, "error: pcls[%zu] > BN (%d)\n", ich, pcls[ich]); } // ignore boundary neutrals diff --git a/source/fitz/draw-glyph.c b/source/fitz/draw-glyph.c index bfd0af40..ffe0d44b 100644 --- a/source/fitz/draw-glyph.c +++ b/source/fitz/draw-glyph.c @@ -455,8 +455,8 @@ fz_dump_glyph_cache_stats(fz_context *ctx) { fz_glyph_cache *cache = ctx->glyph_cache; - fprintf(stderr, "Glyph Cache Size: " FMT_zu "\n", cache->total); + fz_write_printf(ctx, fz_stderr(ctx), "Glyph Cache Size: %zu\n", cache->total); #ifndef NDEBUG - fprintf(stderr, "Glyph Cache Evictions: %d (" FMT_zu " bytes)\n", cache->num_evictions, cache->evicted); + fz_write_printf(ctx, fz_stderr(ctx), "Glyph Cache Evictions: %d (%zu bytes)\n", cache->num_evictions, cache->evicted); #endif } diff --git a/source/fitz/memory.c b/source/fitz/memory.c index 870ec973..10e6f318 100644 --- a/source/fitz/memory.c +++ b/source/fitz/memory.c @@ -56,7 +56,7 @@ fz_malloc(fz_context *ctx, size_t size) p = do_scavenging_malloc(ctx, size); if (!p) - fz_throw(ctx, FZ_ERROR_MEMORY, "malloc of " FMT_zu " bytes failed", size); + fz_throw(ctx, FZ_ERROR_MEMORY, "malloc of %zu bytes failed", size); return p; } @@ -75,11 +75,11 @@ fz_malloc_array(fz_context *ctx, size_t count, size_t size) return 0; if (count > SIZE_MAX / size) - fz_throw(ctx, FZ_ERROR_MEMORY, "malloc of array (" FMT_zu " x " FMT_zu " bytes) failed (size_t overflow)", count, size); + fz_throw(ctx, FZ_ERROR_MEMORY, "malloc of array (%zu x %zu bytes) failed (size_t overflow)", count, size); p = do_scavenging_malloc(ctx, count * size); if (!p) - fz_throw(ctx, FZ_ERROR_MEMORY, "malloc of array (" FMT_zu " x " FMT_zu " bytes) failed", count, size); + fz_throw(ctx, FZ_ERROR_MEMORY, "malloc of array (%zu x %zu bytes) failed", count, size); return p; } @@ -91,7 +91,7 @@ fz_malloc_array_no_throw(fz_context *ctx, size_t count, size_t size) if (count > SIZE_MAX / size) { - fprintf(stderr, "error: malloc of array (" FMT_zu " x " FMT_zu " bytes) failed (size_t overflow)", count, size); + fprintf(stderr, "error: malloc of array (" FZ_FMT_zu " x " FZ_FMT_zu " bytes) failed (size_t overflow)", count, size); return NULL; } @@ -108,13 +108,13 @@ fz_calloc(fz_context *ctx, size_t count, size_t size) if (count > SIZE_MAX / size) { - fz_throw(ctx, FZ_ERROR_MEMORY, "calloc (" FMT_zu " x " FMT_zu " bytes) failed (size_t overflow)", count, size); + fz_throw(ctx, FZ_ERROR_MEMORY, "calloc (%zu x %zu bytes) failed (size_t overflow)", count, size); } p = do_scavenging_malloc(ctx, count * size); if (!p) { - fz_throw(ctx, FZ_ERROR_MEMORY, "calloc (" FMT_zu " x " FMT_zu " bytes) failed", count, size); + fz_throw(ctx, FZ_ERROR_MEMORY, "calloc (%zu x %zu bytes) failed", count, size); } memset(p, 0, count*size); return p; @@ -130,7 +130,7 @@ fz_calloc_no_throw(fz_context *ctx, size_t count, size_t size) if (count > SIZE_MAX / size) { - fprintf(stderr, "error: calloc (" FMT_zu " x " FMT_zu " bytes) failed (size_t overflow)\n", count, size); + fprintf(stderr, "error: calloc (" FZ_FMT_zu " x " FZ_FMT_zu " bytes) failed (size_t overflow)\n", count, size); return NULL; } @@ -154,11 +154,11 @@ fz_resize_array(fz_context *ctx, void *p, size_t count, size_t size) } if (count > SIZE_MAX / size) - fz_throw(ctx, FZ_ERROR_MEMORY, "resize array (" FMT_zu " x " FMT_zu " bytes) failed (size_t overflow)", count, size); + fz_throw(ctx, FZ_ERROR_MEMORY, "resize array (%zu x %zu bytes) failed (size_t overflow)", count, size); np = do_scavenging_realloc(ctx, p, count * size); if (!np) - fz_throw(ctx, FZ_ERROR_MEMORY, "resize array (" FMT_zu " x " FMT_zu " bytes) failed", count, size); + fz_throw(ctx, FZ_ERROR_MEMORY, "resize array (%zu x %zu bytes) failed", count, size); return np; } @@ -173,7 +173,7 @@ fz_resize_array_no_throw(fz_context *ctx, void *p, size_t count, size_t size) if (count > SIZE_MAX / size) { - fprintf(stderr, "error: resize array (" FMT_zu " x " FMT_zu " bytes) failed (size_t overflow)\n", count, size); + fprintf(stderr, "error: resize array (" FZ_FMT_zu " x " FZ_FMT_zu " bytes) failed (size_t overflow)\n", count, size); return NULL; } diff --git a/source/fitz/store.c b/source/fitz/store.c index d7c04241..dbff08fc 100644 --- a/source/fitz/store.c +++ b/source/fitz/store.c @@ -750,7 +750,7 @@ int fz_store_scavenge(fz_context *ctx, size_t size, int *phase) return 0; #ifdef DEBUG_SCAVENGING - printf("Scavenging: store=" FMT_zu " size=" FMT_zu " phase=%d\n", store->size, size, *phase); + printf("Scavenging: store=" FZ_FMT_zu " size=" FZ_FMT_zu " phase=%d\n", store->size, size, *phase); fz_print_store_locked(ctx, stderr); Memento_stats(); #endif @@ -778,7 +778,7 @@ int fz_store_scavenge(fz_context *ctx, size_t size, int *phase) if (scavenge(ctx, tofree)) { #ifdef DEBUG_SCAVENGING - printf("scavenged: store=" FMT_zu "\n", store->size); + printf("scavenged: store=" FZ_FMT_zu "\n", store->size); fz_print_store(ctx, stderr); Memento_stats(); #endif @@ -810,7 +810,7 @@ fz_shrink_store(fz_context *ctx, unsigned int percent) return 0; #ifdef DEBUG_SCAVENGING - fprintf(stderr, "fz_shrink_store: " FMT_zu "\n", store->size/(1024*1024)); + fprintf(stderr, "fz_shrink_store: " FZ_FMT_zu "\n", store->size/(1024*1024)); #endif fz_lock(ctx, FZ_LOCK_ALLOC); @@ -821,7 +821,7 @@ fz_shrink_store(fz_context *ctx, unsigned int percent) success = (store->size <= new_size) ? 1 : 0; fz_unlock(ctx, FZ_LOCK_ALLOC); #ifdef DEBUG_SCAVENGING - fprintf(stderr, "fz_shrink_store after: " FMT_zu "\n", store->size/(1024*1024)); + fprintf(stderr, "fz_shrink_store after: " FZ_FMT_zu "\n", store->size/(1024*1024)); #endif return success; |