Fix store debugging fns so that all output goes to the same file.

5 files changed, 10 insertions, 10 deletions

diff --git a/draw/draw_device.c b/draw/draw_device.c
index 1af7a42e..595c8c3f 100644
--- a/draw/draw_device.c
+++ b/draw/draw_device.c
@@ -1688,11 +1688,11 @@ fz_cmp_tile_key(void *k0_, void *k1_)
 
 #ifndef NDEBUG
 static void
-fz_debug_tile(void *key_)
+fz_debug_tile(FILE *out, void *key_)
 {
 	tile_key *key = (tile_key *)key_;
 
-	printf("(tile id=%x, ctm=%g %g %g %g) ", key->id, key->ctm[0], key->ctm[1], key->ctm[2], key->ctm[3]);
+	fprintf(out, "(tile id=%x, ctm=%g %g %g %g) ", key->id, key->ctm[0], key->ctm[1], key->ctm[2], key->ctm[3]);
 }
 #endif
 
diff --git a/fitz/fitz-internal.h b/fitz/fitz-internal.h
index b76510cf..0436bfcd 100644
--- a/fitz/fitz-internal.h
+++ b/fitz/fitz-internal.h
@@ -490,7 +490,7 @@ struct fz_store_type_s
 	void (*drop_key)(fz_context *,void *);
 	int (*cmp_key)(void *, void *);
 #ifndef NDEBUG
-	void (*debug)(void *);
+	void (*debug)(FILE *, void *);
 #endif
 };
 
diff --git a/fitz/res_store.c b/fitz/res_store.c
index a7d780b2..f9f305d9 100644
--- a/fitz/res_store.c
+++ b/fitz/res_store.c
@@ -363,7 +363,7 @@ fz_remove_item(fz_context *ctx, fz_store_free_fn *free, void *key, fz_store_type
 	fz_item *item;
 	fz_store *store = ctx->store;
 	int drop;
-	fz_store_hash hash;
+	fz_store_hash hash = { NULL };
 	int use_hash = 0;
 
 	if (type->make_hash_key)
@@ -471,7 +471,7 @@ fz_print_store(fz_context *ctx, FILE *out)
 			next->val->refs++;
 		fprintf(out, "store[*][refs=%d][size=%d] ", item->val->refs, item->size);
 		fz_unlock(ctx, FZ_LOCK_ALLOC);
-		item->type->debug(item->key);
+		item->type->debug(out, item->key);
 		fprintf(out, " = %p\n", item->val);
 		fz_lock(ctx, FZ_LOCK_ALLOC);
 		if (next)
diff --git a/pdf/pdf_image.c b/pdf/pdf_image.c
index a756b648..7bc6109c 100644
--- a/pdf/pdf_image.c
+++ b/pdf/pdf_image.c
@@ -79,11 +79,11 @@ pdf_cmp_image_key(void *k0_, void *k1_)
 
 #ifndef NDEBUG
 static void
-pdf_debug_image(void *key_)
+pdf_debug_image(FILE *out, void *key_)
 {
 	pdf_image_key *key = (pdf_image_key *)key_;
 
-	printf("(image %d x %d sf=%d) ", key->image->w, key->image->h, key->l2factor);
+	fprintf(out, "(image %d x %d sf=%d) ", key->image->w, key->image->h, key->l2factor);
 }
 #endif
 
diff --git a/pdf/pdf_store.c b/pdf/pdf_store.c
index 530229d3..9e03cff9 100644
--- a/pdf/pdf_store.c
+++ b/pdf/pdf_store.c
@@ -33,15 +33,15 @@ pdf_cmp_key(void *k0, void *k1)
 
 #ifndef NDEBUG
 static void
-pdf_debug_key(void *key_)
+pdf_debug_key(FILE *out, void *key_)
 {
 	pdf_obj *key = (pdf_obj *)key_;
 
 	if (pdf_is_indirect(key))
 	{
-		printf("(%d %d R) ", pdf_to_num(key), pdf_to_gen(key));
+		fprintf(out, "(%d %d R) ", pdf_to_num(key), pdf_to_gen(key));
 	} else
-		pdf_print_obj(key);
+		pdf_fprint_obj(out, key, 0);
 }
 #endif