Fix return types.

4 files changed, 81 insertions, 1 deletions

diff --git a/graphics/fbm/distinfo b/graphics/fbm/distinfo
index e6c5ed7c87d..62f71917fc3 100644
--- a/graphics/fbm/distinfo
+++ b/graphics/fbm/distinfo
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 08:45:05 agc Exp $
+$NetBSD: distinfo,v 1.4 2013/02/26 11:13:22 joerg Exp $
 
 SHA1 (fbm-1.2.tgz) = 55734774138b7b3301721b88e4e2027011ee780a
 RMD160 (fbm-1.2.tgz) = b23ede1e49ceb7f61f06860eeb342e819bc14a5f
 Size (fbm-1.2.tgz) = 214909 bytes
 SHA1 (patch-aa) = c6d838a7f9f818921c15074edf075325a02a320f
+SHA1 (patch-fbquant.c) = 4f9b5e56eb2b0005c24ab90cf732af972438db0f
+SHA1 (patch-flgifc.c) = 53f811e26ebd25237e5a528bf607b2be21262125
+SHA1 (patch-flgife.c) = 5b36aeec8f6e2e2f0594640b8b41c66111feb0d0
diff --git a/graphics/fbm/patches/patch-fbquant.c b/graphics/fbm/patches/patch-fbquant.c
new file mode 100644
index 00000000000..0ccb5353ac1
--- /dev/null
+++ b/graphics/fbm/patches/patch-fbquant.c
@@ -0,0 +1,49 @@
+$NetBSD: patch-fbquant.c,v 1.1 2013/02/26 11:13:22 joerg Exp $
+
+--- fbquant.c.orig	2013-02-25 17:09:23.000000000 +0000
++++ fbquant.c
+@@ -131,6 +131,10 @@ int fr = 250, fg = 150, fb = 80;
+ 
+ int outtype = DEF_8BIT;	/* Output format desired */
+ 
++static void clr_quantize (FBM *input, FBM *output, COLOR *cmap, int colors);
++static void split_box (PIXEL *box, int boxlen, int clr, int numclr, COLOR *cmap);
++static void load_config (char *filenm);
++
+ /****************************************************************
+  * main
+  ****************************************************************/
+@@ -319,8 +323,7 @@ char *argv[];
+  * load_config: Read a series of fixed/ignore color settings from a file
+  ****************************************************************/
+ 
+-load_config (filenm)
+-char *filenm;
++static void load_config (char *filenm)
+ { FILE *infile = NULL;
+   char buf[BUFSIZ];
+   int aindx, ard, agr, abl;	/* Get 'i' arguments from sscanf */
+@@ -530,10 +533,7 @@ COLOR *cmap;
+  *	      algorithm.
+  ****************************************************************/
+ 
+-split_box (box, boxlen, clr, numclr, cmap)
+-PIXEL *box;
+-int boxlen, clr, numclr;
+-COLOR *cmap;
++static void split_box (PIXEL *box, int boxlen, int clr, int numclr, COLOR *cmap)
+ { int maxv[3], minv[3], numv[3];
+   int pcnt[3][CUBSID];
+   int sbox, snum, split, half, maxdif, dif;
+@@ -841,10 +841,7 @@ PIXEL *a, *b;
+  * clr_quantize: Do Floyd Steinberg quantizing on the image
+  ****************************************************************/
+ 
+-clr_quantize (input, output, cmap, colors, fmap, fixedcolors)
+-FBM *input, *output;
+-COLOR *cmap, *fmap;
+-int colors, fixedcolors;
++static void clr_quantize (FBM *input, FBM *output, COLOR *cmap, int colors)
+ { int **cerr, **lerr, **terr;
+   int width = input->hdr.cols, height = input->hdr.rows;
+   int rowlen = input->hdr.rowlen, plnlen = input->hdr.plnlen;
diff --git a/graphics/fbm/patches/patch-flgifc.c b/graphics/fbm/patches/patch-flgifc.c
new file mode 100644
index 00000000000..1b1008d282a
--- /dev/null
+++ b/graphics/fbm/patches/patch-flgifc.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-flgifc.c,v 1.1 2013/02/26 11:13:22 joerg Exp $
+
+--- flgifc.c.orig	2013-02-25 17:08:02.000000000 +0000
++++ flgifc.c
+@@ -168,10 +168,7 @@ static char *fbmid =
+ code available free from MLM@CS.CMU.EDU and from UUNET archives$";
+ #endif
+ 
+-compress( init_bits, outfile, ReadValue )
+-int init_bits;
+-FILE *outfile;
+-ifunptr ReadValue;
++void compress( int init_bits, FILE *outfile, ifunptr ReadValue )
+ {
+     register long fcode;
+     register code_int i = 0;
diff --git a/graphics/fbm/patches/patch-flgife.c b/graphics/fbm/patches/patch-flgife.c
new file mode 100644
index 00000000000..080205400e8
--- /dev/null
+++ b/graphics/fbm/patches/patch-flgife.c
@@ -0,0 +1,12 @@
+$NetBSD: patch-flgife.c,v 1.1 2013/02/26 11:13:22 joerg Exp $
+
+--- flgife.c.orig	2013-02-25 17:08:54.000000000 +0000
++++ flgife.c
+@@ -57,6 +57,7 @@ static char *fbmid =
+ code available free from MLM@CS.CMU.EDU and from UUNET archives$";
+ #endif
+ 
++void compress( int init_bits, FILE *outfile, ifunptr ReadValue );
+ 
+ /*
+  * Bump the 'curx' and 'cury' to point to the next pixel