summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/common/pdfapp.c16
-rw-r--r--apps/pdfclean.c18
-rw-r--r--apps/pdfdraw.c38
-rw-r--r--apps/pdfextract.c14
-rw-r--r--apps/pdfinfo.c64
-rw-r--r--apps/pdfshow.c18
-rw-r--r--apps/unix/x11pdf.c20
-rw-r--r--fitz/res_font.c2
-rw-r--r--fitzdraw/meshdraw.c2
-rw-r--r--mupdf/cmapdump.c4
-rw-r--r--mupdf/fontdump.c2
-rw-r--r--mupdf/pdf_build.c6
12 files changed, 101 insertions, 103 deletions
diff --git a/apps/common/pdfapp.c b/apps/common/pdfapp.c
index 7fa9310a..20f76661 100644
--- a/apps/common/pdfapp.c
+++ b/apps/common/pdfapp.c
@@ -9,9 +9,9 @@ enum panning
PAN_TO_BOTTOM
};
-void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage);
+static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage);
-void pdfapp_warn(pdfapp_t *app, const char *fmt, ...)
+static void pdfapp_warn(pdfapp_t *app, const char *fmt, ...)
{
char buf[1024];
va_list ap;
@@ -21,7 +21,7 @@ void pdfapp_warn(pdfapp_t *app, const char *fmt, ...)
winwarn(app, buf);
}
-void pdfapp_error(pdfapp_t *app, fz_error error)
+static void pdfapp_error(pdfapp_t *app, fz_error error)
{
winerror(app, error);
}
@@ -207,7 +207,7 @@ void pdfapp_close(pdfapp_t *app)
app->xref = nil;
}
-fz_matrix pdfapp_viewctm(pdfapp_t *app)
+static fz_matrix pdfapp_viewctm(pdfapp_t *app)
{
fz_matrix ctm;
ctm = fz_identity();
@@ -217,7 +217,7 @@ fz_matrix pdfapp_viewctm(pdfapp_t *app)
return ctm;
}
-void pdfapp_panview(pdfapp_t *app, int newx, int newy)
+static void pdfapp_panview(pdfapp_t *app, int newx, int newy)
{
if (newx > 0)
newx = 0;
@@ -241,7 +241,7 @@ void pdfapp_panview(pdfapp_t *app, int newx, int newy)
app->pany = newy;
}
-void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
+static void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
{
char buf[256];
fz_error error;
@@ -311,7 +311,7 @@ void pdfapp_showpage(pdfapp_t *app, int loadpage, int drawpage)
}
-void pdfapp_gotouri(pdfapp_t *app, fz_obj *uri)
+static void pdfapp_gotouri(pdfapp_t *app, fz_obj *uri)
{
char buf[2048];
memcpy(buf, fz_tostrbuf(uri), fz_tostrlen(uri));
@@ -319,7 +319,7 @@ void pdfapp_gotouri(pdfapp_t *app, fz_obj *uri)
winopenuri(app, buf);
}
-void pdfapp_gotopage(pdfapp_t *app, fz_obj *obj)
+static void pdfapp_gotopage(pdfapp_t *app, fz_obj *obj)
{
int oid = fz_tonum(obj);
int i;
diff --git a/apps/pdfclean.c b/apps/pdfclean.c
index 588a7ac7..0c8b263c 100644
--- a/apps/pdfclean.c
+++ b/apps/pdfclean.c
@@ -18,9 +18,9 @@ static char *uselist = NULL;
static int *ofslist = NULL;
static int *genlist = NULL;
-int doencrypt = 0;
-int dogarbage = 0;
-int doexpand = 0;
+static int doencrypt = 0;
+static int dogarbage = 0;
+static int doexpand = 0;
/*
* Garbage collect objects not reachable from the trailer.
@@ -100,7 +100,7 @@ static fz_error sweepref(pdf_xref *xref, fz_obj *ref)
return fz_okay;
}
-void preloadobjstms(void)
+static void preloadobjstms(void)
{
fz_error error;
fz_obj *obj;
@@ -118,7 +118,7 @@ void preloadobjstms(void)
}
}
-void copystream(fz_obj *obj, int oid, int gen)
+static void copystream(fz_obj *obj, int oid, int gen)
{
fz_error error;
fz_buffer *buf;
@@ -143,7 +143,7 @@ void copystream(fz_obj *obj, int oid, int gen)
fz_dropbuffer(buf);
}
-void expandstream(fz_obj *obj, int oid, int gen)
+static void expandstream(fz_obj *obj, int oid, int gen)
{
fz_error error;
fz_buffer *buf;
@@ -179,7 +179,7 @@ void expandstream(fz_obj *obj, int oid, int gen)
fz_dropbuffer(buf);
}
-void saveobject(int oid, int gen)
+static void saveobject(int oid, int gen)
{
fz_error error;
fz_obj *obj;
@@ -230,7 +230,7 @@ void saveobject(int oid, int gen)
fz_dropobj(obj);
}
-void savexref(void)
+static void savexref(void)
{
fz_obj *trailer;
fz_obj *obj;
@@ -279,7 +279,7 @@ void savexref(void)
fprintf(out, "startxref\n%d\n%%%%EOF\n", startxref);
}
-void cleanusage(void)
+static void cleanusage(void)
{
fprintf(stderr,
"usage: pdfclean [options] input.pdf [outfile.pdf]\n"
diff --git a/apps/pdfdraw.c b/apps/pdfdraw.c
index 913363f7..ee4b4a05 100644
--- a/apps/pdfdraw.c
+++ b/apps/pdfdraw.c
@@ -14,8 +14,6 @@
#include <sys/time.h>
#endif
-fz_renderer *drawgc = nil;
-
enum { DRAWPNM, DRAWTXT, DRAWXML };
struct benchmark
@@ -28,16 +26,18 @@ struct benchmark
int maxpage;
};
-int drawmode = DRAWPNM;
-char *drawpattern = nil;
-pdf_page *drawpage = nil;
-float drawzoom = 1.0;
-int drawrotate = 0;
-int drawbands = 1;
-int drawcount = 0;
-int benchmark = 0;
+static fz_renderer *drawgc = nil;
+
+static int drawmode = DRAWPNM;
+static char *drawpattern = nil;
+static pdf_page *drawpage = nil;
+static float drawzoom = 1.0;
+static int drawrotate = 0;
+static int drawbands = 1;
+static int drawcount = 0;
+static int benchmark = 0;
-void local_cleanup(void)
+static void local_cleanup(void)
{
if (xref && xref->store)
{
@@ -52,7 +52,7 @@ void local_cleanup(void)
}
}
-void drawusage(void)
+static void drawusage(void)
{
fprintf(stderr,
"usage: pdfdraw [options] [file.pdf pages ... ]\n"
@@ -68,7 +68,7 @@ void drawusage(void)
exit(1);
}
-void gettime(long *time_)
+static void gettime(long *time_)
{
struct timeval tv;
@@ -78,7 +78,7 @@ void gettime(long *time_)
*time_ = tv.tv_sec * 1000000 + tv.tv_usec;
}
-void drawloadpage(int pagenum, struct benchmark *loadtimes)
+static void drawloadpage(int pagenum, struct benchmark *loadtimes)
{
fz_error error;
fz_obj *pageobj;
@@ -121,7 +121,7 @@ void drawloadpage(int pagenum, struct benchmark *loadtimes)
fflush(stderr);
}
-void drawfreepage(void)
+static void drawfreepage(void)
{
pdf_droppage(drawpage);
drawpage = nil;
@@ -138,7 +138,7 @@ void drawfreepage(void)
}
}
-void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *drawtimes)
+static void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *drawtimes)
{
fz_error error;
fz_matrix ctm;
@@ -263,7 +263,7 @@ void drawpnm(int pagenum, struct benchmark *loadtimes, struct benchmark *drawtim
fprintf(stderr, "\n");
}
-void drawtxt(int pagenum)
+static void drawtxt(int pagenum)
{
fz_error error;
pdf_textline *line;
@@ -285,14 +285,14 @@ void drawtxt(int pagenum)
drawfreepage();
}
-void drawxml(int pagenum)
+static void drawxml(int pagenum)
{
drawloadpage(pagenum, NULL);
fz_debugtree(drawpage->tree);
drawfreepage();
}
-void drawpages(char *pagelist)
+static void drawpages(char *pagelist)
{
int page, spage, epage;
char *spec, *dash;
diff --git a/apps/pdfextract.c b/apps/pdfextract.c
index a1023f5f..5f57c23a 100644
--- a/apps/pdfextract.c
+++ b/apps/pdfextract.c
@@ -4,28 +4,26 @@
#include "pdftool.h"
-int showcolumn;
-
-void showusage(void)
+static void showusage(void)
{
fprintf(stderr, "usage: pdfextract [-d password] <file> [object numbers]\n");
fprintf(stderr, " -d \tdecrypt password\n");
exit(1);
}
-int isimage(fz_obj *obj)
+static int isimage(fz_obj *obj)
{
fz_obj *type = fz_dictgets(obj, "Subtype");
return fz_isname(type) && !strcmp(fz_toname(type), "Image");
}
-int isfontdesc(fz_obj *obj)
+static int isfontdesc(fz_obj *obj)
{
fz_obj *type = fz_dictgets(obj, "Type");
return fz_isname(type) && !strcmp(fz_toname(type), "FontDescriptor");
}
-void saveimage(fz_obj *obj, int num, int gen)
+static void saveimage(fz_obj *obj, int num, int gen)
{
pdf_image *img = nil;
fz_obj *ref;
@@ -131,7 +129,7 @@ void saveimage(fz_obj *obj, int num, int gen)
fz_dropobj(ref);
}
-void savefont(fz_obj *dict, int num, int gen)
+static void savefont(fz_obj *dict, int num, int gen)
{
fz_error error;
char name[1024];
@@ -209,7 +207,7 @@ void savefont(fz_obj *dict, int num, int gen)
fz_dropbuffer(buf);
}
-void showobject(int num, int gen)
+static void showobject(int num, int gen)
{
fz_error error;
fz_obj *obj;
diff --git a/apps/pdfinfo.c b/apps/pdfinfo.c
index 82f9e7cb..ae40a650 100644
--- a/apps/pdfinfo.c
+++ b/apps/pdfinfo.c
@@ -58,24 +58,24 @@ struct info
} u;
};
-struct info *info = nil;
-struct info *cryptinfo = nil;
-struct info **dim = nil;
-int dims = 0;
-struct info **font = nil;
-int fonts = 0;
-struct info **image = nil;
-int images = 0;
-struct info **shading = nil;
-int shadings = 0;
-struct info **pattern = nil;
-int patterns = 0;
-struct info **form = nil;
-int forms = 0;
-struct info **psobj = nil;
-int psobjs = 0;
-
-void local_cleanup(void)
+static struct info *info = nil;
+static struct info *cryptinfo = nil;
+static struct info **dim = nil;
+static int dims = 0;
+static struct info **font = nil;
+static int fonts = 0;
+static struct info **image = nil;
+static int images = 0;
+static struct info **shading = nil;
+static int shadings = 0;
+static struct info **pattern = nil;
+static int patterns = 0;
+static struct info **form = nil;
+static int forms = 0;
+static struct info **psobj = nil;
+static int psobjs = 0;
+
+static void local_cleanup(void)
{
int i;
@@ -148,7 +148,7 @@ void local_cleanup(void)
}
}
-void
+static void
infousage(void)
{
fprintf(stderr,
@@ -157,7 +157,7 @@ infousage(void)
" -f -\tlist fonts\n"
" -i -\tlist images\n"
" -m -\tlist dimensions\n"
- " -p -\tlist pattners\n"
+ " -p -\tlist patterns\n"
" -s -\tlist shadings\n"
" -x -\tlist form and postscript xobjects\n"
" example:\n"
@@ -165,7 +165,7 @@ infousage(void)
exit(1);
}
-void
+static void
gatherglobalinfo()
{
info = fz_malloc(sizeof (struct info));
@@ -203,7 +203,7 @@ gatherglobalinfo()
}
}
-fz_error
+static fz_error
gatherdimensions(int page, fz_obj *pageref, fz_obj *pageobj)
{
fz_obj *ref;
@@ -246,7 +246,7 @@ gatherdimensions(int page, fz_obj *pageref, fz_obj *pageobj)
return fz_okay;
}
-fz_error
+static fz_error
gatherfonts(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
{
int i;
@@ -309,7 +309,7 @@ gatherfonts(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
return fz_okay;
}
-fz_error
+static fz_error
gatherimages(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
{
int i;
@@ -415,7 +415,7 @@ gatherimages(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
return fz_okay;
}
-fz_error
+static fz_error
gatherforms(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
{
int i;
@@ -482,7 +482,7 @@ gatherforms(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
return fz_okay;
}
-fz_error
+static fz_error
gatherpsobjs(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
{
int i;
@@ -538,7 +538,7 @@ gatherpsobjs(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
return fz_okay;
}
-fz_error
+static fz_error
gathershadings(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
{
int i;
@@ -585,7 +585,7 @@ gathershadings(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
return fz_okay;
}
-fz_error
+static fz_error
gatherpatterns(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
{
int i;
@@ -647,7 +647,7 @@ gatherpatterns(int page, fz_obj *pageref, fz_obj *pageobj, fz_obj *dict)
return fz_okay;
}
-void
+static void
gatherinfo(int show, int page)
{
fz_error error;
@@ -725,7 +725,7 @@ gatherinfo(int show, int page)
}
}
-void
+static void
printglobalinfo(void)
{
printf("\nPDF-%d.%d\n", xref->version / 10, xref->version % 10);
@@ -745,7 +745,7 @@ printglobalinfo(void)
printf("\nPages: %d\n\n", pdf_getpagecount(pagetree));
}
-void
+static void
printinfo(char *filename, int show, int page)
{
int i;
@@ -952,7 +952,7 @@ printinfo(char *filename, int show, int page)
}
}
-void
+static void
showinfo(char *filename, int show, char *pagelist)
{
int page, spage, epage;
diff --git a/apps/pdfshow.c b/apps/pdfshow.c
index 164daca0..19fab461 100644
--- a/apps/pdfshow.c
+++ b/apps/pdfshow.c
@@ -4,11 +4,11 @@
#include "pdftool.h"
-int showbinary = 0;
-int showdecode = 0;
-int showcolumn;
+static int showbinary = 0;
+static int showdecode = 0;
+static int showcolumn;
-void showusage(void)
+static void showusage(void)
{
fprintf(stderr, "usage: pdfshow [-bx] [-d password] <file> [xref] [trailer] [object numbers]\n");
fprintf(stderr, " -b \tprint streams as raw binary data\n");
@@ -17,7 +17,7 @@ void showusage(void)
exit(1);
}
-void showtrailer(void)
+static void showtrailer(void)
{
if (!xref)
die(fz_throw("no file specified"));
@@ -26,7 +26,7 @@ void showtrailer(void)
printf("\n");
}
-void showxref(void)
+static void showxref(void)
{
if (!xref)
die(fz_throw("no file specified"));
@@ -34,7 +34,7 @@ void showxref(void)
printf("\n");
}
-void showsafe(unsigned char *buf, int n)
+static void showsafe(unsigned char *buf, int n)
{
int i;
for (i = 0; i < n; i++) {
@@ -57,7 +57,7 @@ void showsafe(unsigned char *buf, int n)
}
}
-void showstream(int num, int gen)
+static void showstream(int num, int gen)
{
fz_error error;
fz_stream *stm;
@@ -89,7 +89,7 @@ void showstream(int num, int gen)
fz_dropstream(stm);
}
-void showobject(int num, int gen)
+static void showobject(int num, int gen)
{
fz_error error;
fz_obj *obj;
diff --git a/apps/unix/x11pdf.c b/apps/unix/x11pdf.c
index d19e902f..b8d7c267 100644
--- a/apps/unix/x11pdf.c
+++ b/apps/unix/x11pdf.c
@@ -98,7 +98,7 @@ char *winpassword(pdfapp_t *app, char *filename)
* X11 magic
*/
-void winopen(void)
+static void winopen(void)
{
XWMHints *hints;
@@ -259,7 +259,7 @@ static void invertcopyrect()
justcopied = 1;
}
-void winblit(pdfapp_t *app)
+static void winblit(pdfapp_t *app)
{
int x0 = gapp.panx;
int y0 = gapp.pany;
@@ -296,7 +296,7 @@ void winrepaint(pdfapp_t *app)
dirty = 1;
}
-void windrawstring(pdfapp_t *app, char *s, int x, int y)
+static void windrawstring(pdfapp_t *app, char *s, int x, int y)
{
int prevfunction;
XGCValues xgcv;
@@ -316,7 +316,7 @@ void windrawstring(pdfapp_t *app, char *s, int x, int y)
XChangeGC(xdpy, xgc, GCFunction, &xgcv);
}
-void windrawpageno(pdfapp_t *app)
+static void windrawpageno(pdfapp_t *app)
{
char s[100];
@@ -427,7 +427,7 @@ void winopenuri(pdfapp_t *app, char *buf)
system(cmd);
}
-void onkey(int c)
+static void onkey(int c)
{
if (justcopied)
{
@@ -443,7 +443,7 @@ void onkey(int c)
pdfapp_onkey(&gapp, c);
}
-void onmouse(int x, int y, int btn, int modifiers, int state)
+static void onmouse(int x, int y, int btn, int modifiers, int state)
{
if (state != 0 && justcopied)
{
@@ -454,13 +454,13 @@ void onmouse(int x, int y, int btn, int modifiers, int state)
pdfapp_onmouse(&gapp, x, y, btn, modifiers, state);
}
-void usage(void)
+static void usage(void)
{
fprintf(stderr, "usage: mupdf [-d password] [-z zoom] [-p pagenumber] file.pdf\n");
exit(1);
}
-void winawaitevent(struct timeval *tmo, struct timeval *tmo_at)
+static void winawaitevent(struct timeval *tmo, struct timeval *tmo_at)
{
if (tmo_at->tv_sec == 0 && tmo_at->tv_usec == 0 &&
tmo->tv_sec == 0 && tmo->tv_usec == 0)
@@ -482,7 +482,7 @@ void winawaitevent(struct timeval *tmo, struct timeval *tmo_at)
}
}
-void winsettmo(struct timeval *tmo, struct timeval *tmo_at)
+static void winsettmo(struct timeval *tmo, struct timeval *tmo_at)
{
struct timeval now;
@@ -493,7 +493,7 @@ void winsettmo(struct timeval *tmo, struct timeval *tmo_at)
timeradd(&now, tmo, tmo_at);
}
-void winresettmo(struct timeval *tmo, struct timeval *tmo_at)
+static void winresettmo(struct timeval *tmo, struct timeval *tmo_at)
{
tmo->tv_sec = 0;
tmo->tv_usec = 0;
diff --git a/fitz/res_font.c b/fitz/res_font.c
index 42f5595d..8a2afbf7 100644
--- a/fitz/res_font.c
+++ b/fitz/res_font.c
@@ -93,7 +93,7 @@ struct ft_error
char *str;
};
-const struct ft_error ft_errors[] =
+static const struct ft_error ft_errors[] =
{
#include FT_ERRORS_H
};
diff --git a/fitzdraw/meshdraw.c b/fitzdraw/meshdraw.c
index ebaaaeaa..108c8768 100644
--- a/fitzdraw/meshdraw.c
+++ b/fitzdraw/meshdraw.c
@@ -218,7 +218,7 @@ stepedge(int *ael, int *del, int n)
ael[k] += del[k];
}
-void
+static void
fz_drawtriangle(fz_pixmap *pix, float *av, float *bv, float *cv, int n)
{
float poly[MAXV][MAXN];
diff --git a/mupdf/cmapdump.c b/mupdf/cmapdump.c
index d40c51b1..69cffa76 100644
--- a/mupdf/cmapdump.c
+++ b/mupdf/cmapdump.c
@@ -10,7 +10,7 @@
#include "../mupdf/pdf_cmap.c"
#include "../mupdf/pdf_cmap_parse.c"
-char *
+static char *
flagtoname(int flag)
{
switch (flag)
@@ -23,7 +23,7 @@ flagtoname(int flag)
return "-1,";
}
-void
+static void
clean(char *p)
{
while (*p)
diff --git a/mupdf/fontdump.c b/mupdf/fontdump.c
index 353dcd97..6b9077b1 100644
--- a/mupdf/fontdump.c
+++ b/mupdf/fontdump.c
@@ -3,7 +3,7 @@
#include <stdio.h>
#include <string.h>
-int
+static int
hexdump(FILE *fo, FILE *fi)
{
int c, n;
diff --git a/mupdf/pdf_build.c b/mupdf/pdf_build.c
index 77f01184..86f85090 100644
--- a/mupdf/pdf_build.c
+++ b/mupdf/pdf_build.c
@@ -44,7 +44,7 @@ pdf_initgstate(pdf_gstate *gs)
gs->head = nil;
}
-fz_error
+static fz_error
pdf_newovernode(fz_node **nodep, pdf_gstate *gs)
{
if (gs->blendmode == FZ_BNORMAL)
@@ -849,7 +849,7 @@ pdf_flushtext(pdf_csi *csi)
return fz_okay;
}
-fz_error
+static fz_error
showglyph(pdf_csi *csi, int cid)
{
pdf_gstate *gstate = csi->gstate + csi->gtop;
@@ -933,7 +933,7 @@ showglyph(pdf_csi *csi, int cid)
return fz_okay;
}
-void
+static void
showspace(pdf_csi *csi, float tadj)
{
pdf_gstate *gstate = csi->gstate + csi->gtop;
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-13 15:03:47 +0000