Author: Andreas Beckmann <anbe@debian.org>
Description: fix building with -Werror=implicit-int

--- a/bifont.c
+++ b/bifont.c
@@ -74,6 +74,7 @@ static byte header[JSTFMHEAD];
 
 /* TYPE: tfm
  */
+int
 tfm_access(proto, fe, acca)
 char *proto;
 struct font_entry *fe;
--- a/compfont.c
+++ b/compfont.c
@@ -17,6 +17,7 @@ struct fontop cmpop = {
     init_comp_fontinfo,
 };
 
+int
 comptype_init(pars, ff)
 char *pars;
 struct comp **ff;
@@ -37,6 +38,7 @@ struct comp **ff;
     return TRUE;
 }
 
+int
 comptype_access(ffcmp, fe, acca)
 struct comp *ffcmp;
 struct font_entry *fe;
@@ -106,6 +108,7 @@ struct font_entry *fe;
 	MarkChar(makejis(ku,ten)); \
 	setcurfont(save);
 
+int
 cmpntt_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -150,6 +153,7 @@ int c;
 	SetChar(makejis(ku,ten), chmove); \
 	setcurfont(save);
 
+int
 cmpntt_setchar(fe, c)
 struct font_entry *fe;
 unsigned int c;
@@ -162,6 +166,7 @@ unsigned int c;
     return 0;
 }
 
+int
 cmpntt_setstring(fe, s, len)
 struct font_entry *fe;
 byte *s;
@@ -192,6 +197,7 @@ struct font_entry *fe;
     fe->fnt_readfontinfo = read_cmpdcd_fontinfo;
 }
 
+int
 cmpdcd_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -230,6 +236,7 @@ int c;
     return sfe->dev_fontdict(sfe, makejis(ku, ten));
 }
 
+int
 cmpdcd_setchar(fe, c)
 struct font_entry *fe;
 unsigned int c;
@@ -242,6 +249,7 @@ unsigned int c;
     return 0;
 }
 
+int
 cmpdcd_setstring(fe, s, len)
 struct font_entry *fe;
 byte *s;
--- a/decompfont.c
+++ b/decompfont.c
@@ -17,6 +17,7 @@ struct fontop dcmpop = {
     init_decomp_fontinfo,
 };
 
+int
 decomptype_init(pars, ff)
 char *pars;
 struct decomp **ff;
@@ -37,6 +38,7 @@ struct decomp **ff;
     return TRUE;
 }
 
+int
 decomptype_access(ffdcmp, fe, acca)
 struct decomp *ffdcmp;
 struct font_entry *fe;
@@ -110,6 +112,7 @@ struct font_entry *fe;
 	MarkChar(c); \
 	setcurfont(save);
 
+int
 dcmpntt_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -154,6 +157,7 @@ int c;
 	SetChar(c, chmove); \
 	setcurfont(save);
 
+int
 dcmpntt_setchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -167,6 +171,7 @@ int c;
 }
 
 /* ARGSUSED */
+int
 dcmpntt_setstring(fe, s, len)
 struct font_entry *fe;
 byte *s;
@@ -200,6 +205,7 @@ struct font_entry *fe;
     fe->fnt_readfontinfo = read_dcmpdcd_fontinfo;
 }
 
+int
 dcmpdcd_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -238,6 +244,7 @@ int c;
     return sfe->dev_fontdict(sfe, cc);
 }
 
+int
 dcmpdcd_setchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -251,6 +258,7 @@ int c;
 }
 
 /* ARGSUSED */
+int
 dcmpdcd_setstring(fe, s, len)
 struct font_entry *fe;
 byte *s;
--- a/dvi.c
+++ b/dvi.c
@@ -282,6 +282,7 @@ int x, y;
 {
 }
 
+int
 dvi_setrule(a, b, com)
 int a, b, com;
 {
@@ -299,6 +300,7 @@ int a, b, com;
     dvi_setrule(a, b, com);
 }
 
+int
 dvi_dir(d)
 int d;
 {
@@ -343,16 +345,19 @@ end_string()
     }
 }
 
+int
 bs_elim()
 {
     dvi_dir(dir);
 }
 
+int
 es_elim()
 {
     dvi_dir(HOR);
 }
 
+int
 bs_spec()
 {
     dvi_move_beg = *dvi_move;
@@ -361,6 +366,7 @@ bs_spec()
     dvipos += dir_spec_vert_len;
 }
 
+int
 es_spec()
 {
     putbytes(outfp, dir_spec_end, dir_spec_end_len);
@@ -369,11 +375,13 @@ es_spec()
     dev_makemove(*dvi_move-dvi_move_beg, DOWN1-1);
 }
 
+int
 bs_ignore()
 {
     dvi_move_beg = *dvi_move;
 }
 
+int
 es_ignore()
 {
     dev_makemove(*dvi_move-dvi_move_beg, DOWN1-1);
@@ -381,21 +389,25 @@ es_ignore()
 
 #define	MARKWIDTH	50000
 
+int
 bs_mline()
 {
     dvi_move_beg = *dvi_move;
 }
 
+int
 es_mline()
 {
     dev_makemove(*dvi_move-dvi_move_beg, DOWN1-1);
     dvi_setrule(*dvi_move-dvi_move_beg, MARKWIDTH, PUT_RULE);
 }
 
+int
 bs_mchar()
 {
 }
 
+int
 es_mchar()
 {
 }
--- a/dvifont.c
+++ b/dvifont.c
@@ -62,6 +62,7 @@ unsigned int c;
     }
 }
 
+int
 dvi_setchar(fe, c)
 struct font_entry *fe;
 unsigned int c;
@@ -70,6 +71,7 @@ unsigned int c;
     dvichar(c);
 }
 
+int
 dvi_setstring(fe, s, len)
 struct font_entry *fe;
 byte *s;
--- a/dvitfm.c
+++ b/dvitfm.c
@@ -46,6 +46,7 @@ struct font_entry *fe;
     }
 }
 
+int
 tfm_setchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -59,6 +60,7 @@ int c;
     return cw;
 }
 
+int
 tfm_setstring(fe, s, len)
 struct font_entry *fe;
 char *s;
@@ -78,6 +80,7 @@ int len;
     return cw;
 }
 
+int
 blank_setchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -90,6 +93,7 @@ int c;
     return cw;
 }
 
+int
 blank_setstring(fe, s, len)
 struct font_entry *fe;
 char *s;
@@ -107,6 +111,7 @@ int len;
     return cw;
 }
 
+int
 mchar_setchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -122,6 +127,7 @@ int c;
     return cw;
 }
 
+int
 mchar_setstring(fe, s, len)
 struct font_entry *fe;
 char *s;
--- a/fontcom.c
+++ b/fontcom.c
@@ -97,6 +97,7 @@ char *n;
  * font, the font may be used only in some chars of vf and the chars may
  * not be used in a particular dvi.
  */
+int
 first_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -147,6 +148,7 @@ struct font_entry *fe;
 /* operations for null font */
 
 /* ARGSUSED */
+int
 null_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -175,6 +177,7 @@ int c;
 }
 
 /* ARGSUSED */
+int
 null_setchar(c)
 int c;
 {
@@ -182,6 +185,7 @@ int c;
 }
 
 /* ARGSUSED */
+int
 null_setstring(s, len)
 byte *s;
 int len;
--- a/fontdesc.c
+++ b/fontdesc.c
@@ -122,6 +122,7 @@ BOOLEAN top;
  * newlcd <- dir part of lcd+f
  */
 static
+int
 findsearchfile(newf, newlcd, ld, lcd, f, ext)
 char *newf, *newlcd, *ld, *lcd, *f, *ext;
 {
@@ -150,6 +151,7 @@ char *newf, *newlcd, *ld, *lcd, *f, *ext
  * newf, newlcd <- set by findsearchfile
  */
 static
+int
 pathsearchfile(nextpath, path, newf, newlcd, newld, lcd, f, ext)
 char **nextpath, *path;
 char *newf, *newlcd, *newld, *lcd, *f, *ext;
@@ -245,6 +247,7 @@ char *ext;
 }
 
 #ifdef UNDEF
+int
 searchfiledir(f, ld, newf)
 char *f;
 struct libdir_body *ld;
@@ -316,6 +319,7 @@ char *field;
     *field = '\0';
 }
 
+int
 getqfield0(field)
 char *field;
 {
@@ -340,6 +344,7 @@ char *field;
 	getfield(field);
 }
 
+int
 getqfield(field)
 char *field;
 {
@@ -348,6 +353,7 @@ char *field;
 }
 
 #ifdef UNDEF
+int
 getoqfield(field)
 char *field;
 {
@@ -359,6 +365,7 @@ char *field;
 }
 #endif
 
+int
 getlfield(field)
 char *field;
 {
@@ -524,6 +531,7 @@ char *type;
     return NULL;
 }
 
+int
 pathtype_init(proto, ff)
 char *proto;
 struct funcfont **ff;
@@ -549,6 +557,7 @@ struct definition {
 static struct definition *definitions = NULL;
 static struct definition *arg_defs = NULL;
 
+int
 add_def0(var, val)
 char *var, *val;
 {
@@ -561,6 +570,7 @@ char *var, *val;
     definitions = def;
 }
 
+int
 add_def(var, val)
 char *var, *val;
 {
@@ -900,6 +910,7 @@ int *rd, *rs;
 /*
  * init_fontinfo
  */
+int
 init_finfo(fe, fonts)
 struct font_entry *fe;
 struct fontdesc *fonts;
--- a/funcfont.c
+++ b/funcfont.c
@@ -22,6 +22,7 @@ struct fontop funcop = {
     init_func_fontinfo,
 };
 
+int
 functype_init(desc, ff)
 char *desc;
 struct funcfont **ff;
@@ -79,6 +80,7 @@ struct funcfont **ff;
     return TRUE;
 }
 
+int
 functype_access(ff, fe, acca)
 struct funcfont *ff;
 struct font_entry *fe;
--- a/util.c
+++ b/util.c
@@ -10,6 +10,7 @@ char *p, *e;
     return p;
 }
 
+int
 makeuint(s, n)		/* return n byte quantity from string */
 byte *s;
 int n;
@@ -24,6 +25,7 @@ int n;
     return x;
 }
 
+int
 makeint(s, n)		/* return n byte quantity from string */
 byte *s;
 int n;
@@ -95,6 +97,7 @@ int x;
 }
 
 static
+int
 i2b(x, b)
 unsigned int x;
 unsigned char *b;
--- a/virfont.c
+++ b/virfont.c
@@ -36,6 +36,7 @@ struct fontop jvfop = {
     init_jvf_fontinfo,
 };
 
+int
 vftype_access(proto, fe, acca)
 char *proto;
 struct font_entry *fe;
@@ -239,6 +240,7 @@ int nchars;
     return vfi;
 }
 
+int
 vf_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -252,6 +254,7 @@ int c;
 	vf_mc(fe, &virfinfo(fe)->ch[c], c);
 }
 
+int
 jvf_markchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -432,6 +435,7 @@ int c;
     Fatal("%s implementation error: vf_fontdict", G_progname);
 }
 
+int
 vf_setchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -442,6 +446,7 @@ int c;
 	return vf_sc(fe, &virfinfo(fe)->ch[c], c);
 }
 
+int
 jvf_setchar(fe, c)
 struct font_entry *fe;
 int c;
@@ -523,6 +528,7 @@ int c;
     return ce->tfmw;
 }
 
+int
 vf_setstring(fe, s, len)
 struct font_entry *fe;
 unsigned char *s;
@@ -535,6 +541,7 @@ int len;
 	*move += vf_setchar(fe, *sp);
 }
 
+int
 jvf_setstring(fe, s, len)
 struct font_entry *fe;
 unsigned char *s;