Make fz_print functions all take a FILE *.

Also tidy up the taking of fz_context *'s, and hide an unwanted indent
param.

1 files changed, 12 insertions, 5 deletions

diff --git a/fitz/res_text.c b/fitz/res_text.c
index 43b4471a..643b4c9f 100644
--- a/fitz/res_text.c
+++ b/fitz/res_text.c
@@ -118,23 +118,30 @@ fz_add_text(fz_context *ctx, fz_text *text, int gid, int ucs, float x, float y)
 	text->len++;
 }
 
-static int isxmlmeta(int c)
+static int
+isxmlmeta(int c)
 {
 	return c < 32 || c >= 128 || c == '&' || c == '<' || c == '>' || c == '\'' || c == '"';
 }
 
-void fz_print_text(fz_context *ctx, fz_text *text, int indent)
+static void
+do_print_text(FILE *out, fz_text *text, int indent)
 {
 	int i, n;
 	for (i = 0; i < text->len; i++)
 	{
 		for (n = 0; n < indent; n++)
-			putchar(' ');
+			fputc(' ', out);
 		if (!isxmlmeta(text->items[i].ucs))
-			printf("<g ucs=\"%c\" gid=\"%d\" x=\"%g\" y=\"%g\" />\n",
+			fprintf(out, "<g ucs=\"%c\" gid=\"%d\" x=\"%g\" y=\"%g\" />\n",
 				text->items[i].ucs, text->items[i].gid, text->items[i].x, text->items[i].y);
 		else
-			printf("<g ucs=\"U+%04X\" gid=\"%d\" x=\"%g\" y=\"%g\" />\n",
+			fprintf(out, "<g ucs=\"U+%04X\" gid=\"%d\" x=\"%g\" y=\"%g\" />\n",
 				text->items[i].ucs, text->items[i].gid, text->items[i].x, text->items[i].y);
 	}
 }
+
+void fz_print_text(fz_context *ctx, FILE *out, fz_text *text)
+{
+	do_print_text(out, text, 0);
+}