Make several functions static, removing them from the public interface.

9 files changed, 15 insertions, 18 deletions

diff --git a/draw/imagedraw.c b/draw/imagedraw.c
index e93405e5..d2468b38 100644
--- a/draw/imagedraw.c
+++ b/draw/imagedraw.c
@@ -191,7 +191,7 @@ fz_paintaffinecolorNnear(byte *dp, byte *sp, int sw, int sh, int u, int v, int f
 	}
 }
 
-void
+static void
 fz_paintaffinelerp(byte *dp, byte *sp, int sw, int sh, int u, int v, int fa, int fb, int w, int n, int alpha)
 {
 	if (alpha == 255)
@@ -216,7 +216,7 @@ fz_paintaffinelerp(byte *dp, byte *sp, int sw, int sh, int u, int v, int fa, int
 	}
 }
 
-void
+static void
 fz_paintaffinenear(byte *dp, byte *sp, int sw, int sh, int u, int v, int fa, int fb, int w, int n, int alpha)
 {
 	if (alpha == 255)
@@ -241,7 +241,7 @@ fz_paintaffinenear(byte *dp, byte *sp, int sw, int sh, int u, int v, int fa, int
 	}
 }
 
-void
+static void
 fz_paintaffinecolorlerp(byte *dp, byte *sp, int sw, int sh, int u, int v, int fa, int fb, int w, int n, byte *color)
 {
 	switch (n)
@@ -252,7 +252,7 @@ fz_paintaffinecolorlerp(byte *dp, byte *sp, int sw, int sh, int u, int v, int fa
 	}
 }
 
-void
+static void
 fz_paintaffinecolornear(byte *dp, byte *sp, int sw, int sh, int u, int v, int fa, int fb, int w, int n, byte *color)
 {
 	switch (n)
diff --git a/draw/porterduff.c b/draw/porterduff.c
index c3699f0c..b8130ab6 100644
--- a/draw/porterduff.c
+++ b/draw/porterduff.c
@@ -199,7 +199,7 @@ fz_paintspanmaskN(byte * restrict dp, byte * restrict sp, byte * restrict mp, in
 	}
 }
 
-void
+static void
 fz_paintspanmask(byte * restrict dp, byte * restrict sp, byte * restrict mp, int n, int w)
 {
 	switch (n)
diff --git a/fitz/crypt_arc4.c b/fitz/crypt_arc4.c
index 791e5ee9..1db8a132 100644
--- a/fitz/crypt_arc4.c
+++ b/fitz/crypt_arc4.c
@@ -61,7 +61,7 @@ fz_arc4init(fz_arc4 *arc4, const unsigned char *key, const unsigned keylen)
 	}
 }
 
-unsigned char
+static unsigned char
 fz_arc4next(fz_arc4 *arc4)
 {
 	unsigned int x;
diff --git a/fitz/fitz.h b/fitz/fitz.h
index ca849f1d..64a0cd36 100644
--- a/fitz/fitz.h
+++ b/fitz/fitz.h
@@ -295,7 +295,6 @@ struct fz_arc4_s
 };
 
 void fz_arc4init(fz_arc4 *state, const unsigned char *key, const unsigned len);
-unsigned char fz_arc4next(fz_arc4 *state);
 void fz_arc4encrypt(fz_arc4 *state, unsigned char *dest, const unsigned char *src, const unsigned len);
 
 /* AES block cipher implementation from XYSSL */
@@ -441,7 +440,6 @@ void fz_dictdel(fz_obj *dict, fz_obj *key);
 void fz_dictdels(fz_obj *dict, char *key);
 void fz_sortdict(fz_obj *dict);
 
-int fz_sprintobj(char *s, int n, fz_obj *obj, int tight);
 int fz_fprintobj(FILE *fp, fz_obj *obj, int tight);
 void fz_debugobj(fz_obj *obj);
 void fz_debugref(fz_obj *obj);
@@ -1093,7 +1091,6 @@ void fz_unpacktile(fz_pixmap *dst, unsigned char * restrict src, int n, int dept
 
 void fz_paintspan(unsigned char * restrict dp, unsigned char * restrict sp, int n, int w, int alpha);
 void fz_paintspancolor(unsigned char * restrict dp, unsigned char * restrict mp, int n, int w, unsigned char *color);
-void fz_paintspanmask(unsigned char * restrict dp, unsigned char * restrict sp, unsigned char * restrict mp, int n, int w);
 
 void fz_paintaffinecolor(unsigned char *dp, unsigned char *sp, int sw, int sh, int u, int v, int fa, int fb, int w, int n, unsigned char *color);
 
diff --git a/fitz/obj_print.c b/fitz/obj_print.c
index a6ef73e2..4233b80f 100644
--- a/fitz/obj_print.c
+++ b/fitz/obj_print.c
@@ -273,7 +273,7 @@ static void fmtobj(struct fmt *fmt, fz_obj *obj)
 		fmtputs(fmt, "<unknown object>");
 }
 
-int
+static int
 fz_sprintobj(char *s, int n, fz_obj *obj, int tight)
 {
 	struct fmt fmt;
diff --git a/mupdf/pdf_annot.c b/mupdf/pdf_annot.c
index 9f8724a1..300cf9d0 100644
--- a/mupdf/pdf_annot.c
+++ b/mupdf/pdf_annot.c
@@ -152,7 +152,7 @@ pdf_freeannot(pdf_annot *annot)
 	fz_free(annot);
 }
 
-void
+static void
 pdf_transformannot(pdf_annot *annot)
 {
 	fz_matrix matrix = annot->ap->matrix;
diff --git a/mupdf/pdf_build.c b/mupdf/pdf_build.c
index da1b193c..55fbc76b 100644
--- a/mupdf/pdf_build.c
+++ b/mupdf/pdf_build.c
@@ -149,7 +149,7 @@ pdf_setshade(pdf_csi *csi, int what, fz_shade *shade)
 	mat->shade = fz_keepshade(shade);
 }
 
-void
+static void
 pdf_showpattern(pdf_csi *csi, pdf_pattern *pat, fz_rect bbox, int what)
 {
 	pdf_gstate *gstate;
@@ -229,7 +229,7 @@ cleanup:
 	pdf_grestore(csi);
 }
 
-void
+static void
 pdf_begingroup(pdf_csi *csi, fz_rect bbox)
 {
 	pdf_gstate *gstate = csi->gstate + csi->gtop;
@@ -256,7 +256,7 @@ pdf_begingroup(pdf_csi *csi, fz_rect bbox)
 		csi->dev->begingroup(csi->dev->user, bbox, 0, 0, gstate->blendmode, 1);
 }
 
-void
+static void
 pdf_endgroup(pdf_csi *csi)
 {
 	pdf_gstate *gstate = csi->gstate + csi->gtop;
diff --git a/mupdf/pdf_function.c b/mupdf/pdf_function.c
index c5806bf2..ee773593 100644
--- a/mupdf/pdf_function.c
+++ b/mupdf/pdf_function.c
@@ -1643,7 +1643,7 @@ pdf_evalfunction(pdf_function *func, float *in, int inlen, float *out, int outle
 	return fz_okay;
 }
 
-void
+static void
 pdf_debugindent(char *prefix, int level, char *suffix)
 {
 	int i;
@@ -1656,7 +1656,7 @@ pdf_debugindent(char *prefix, int level, char *suffix)
 	printf("%s", suffix);
 }
 
-void
+static void
 pdf_debugpsfunccode(psobj *funccode, psobj *code, int level)
 {
 	int eof, wasop;
@@ -1742,7 +1742,7 @@ pdf_debugpsfunccode(psobj *funccode, psobj *code, int level)
 	pdf_debugindent("", --level, "} ");
 }
 
-void
+static void
 pdf_debugfunctionimp(pdf_function *func, int level)
 {
 	int i;
diff --git a/mupdf/pdf_pagetree.c b/mupdf/pdf_pagetree.c
index ff5e2920..a6c3c122 100644
--- a/mupdf/pdf_pagetree.c
+++ b/mupdf/pdf_pagetree.c
@@ -43,7 +43,7 @@ pdf_findpageobject(pdf_xref *xref, fz_obj *page)
 	return 0;
 }
 
-void
+static void
 pdf_loadpagetreenode(pdf_xref *xref, fz_obj *node, struct info info)
 {
 	fz_obj *dict, *kids, *count;