Fix up function definitions to match implementation use of return

values.

11 files changed, 245 insertions, 27 deletions

diff --git a/inputmethod/skkfep/distinfo b/inputmethod/skkfep/distinfo
index 952394d007d..02008adb09f 100644
--- a/inputmethod/skkfep/distinfo
+++ b/inputmethod/skkfep/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/02/18 22:08:50 wiz Exp $
+$NetBSD: distinfo,v 1.6 2012/12/20 21:50:47 joerg Exp $
 
 SHA1 (skkfep0.86c.tar.gz) = fe1473c2a9d28901a96fdc5cf51079de47c86c32
 RMD160 (skkfep0.86c.tar.gz) = 11bfc483ee31b74070d288ecb3e269cb66347760
@@ -10,7 +10,14 @@ SHA1 (patch-ad) = 2756635d4c92bdeb42bcd537b67cacfe8de9d053
 SHA1 (patch-ba) = c814f8315aa904bc1e395544060378df6608d8c3
 SHA1 (patch-bb) = 9eb7fb317c661ebc293fdf02d2128b31a465c4ab
 SHA1 (patch-bc) = d5f63071cfd9f5cc73abb683c610b04df419c932
-SHA1 (patch-bd) = 8e3321de9841382f932bb9edf1470d1cbe455bce
-SHA1 (patch-be) = 10aa4c7002b224f80e8af540012f76a661cec92d
-SHA1 (patch-bf) = c8e76e009fee4ad6f86bf70c71c0bc51dc596174
+SHA1 (patch-bd) = 5dc60197f1733d2f2375764da710346f01626475
+SHA1 (patch-be) = 9f5363c80f432ba0fb6021adf4e5a75a5180ed2c
+SHA1 (patch-bf) = 15211a5a1697985e636a8e9901df09ff523fb29a
 SHA1 (patch-bg) = b1159a569233280cc1ad9df2da0189fd3a2d08ad
+SHA1 (patch-jc.c) = f70054da415c1d387ba85433d7814bf019d80556
+SHA1 (patch-keybind.c) = 26b1d92e3f0a4d3597ea5c0b016ee17b10aa2642
+SHA1 (patch-kkconv.c) = fb441a766f225a6452d5bf778f05e19bdf0b3f07
+SHA1 (patch-romkan-org.c) = 3da9260274e7cd218bddb020134fdbf1a061dc87
+SHA1 (patch-simpledic.c) = 7760ffebed845a67fc8751c7b59b680676211a4f
+SHA1 (patch-skklib.c) = 8c47ad293b67478f2b27941f47e7ceff3dc7a0af
+SHA1 (patch-terms.c) = 2ce090605e1bf4f591dcc2226f4f6e65d9378e59
diff --git a/inputmethod/skkfep/patches/patch-bd b/inputmethod/skkfep/patches/patch-bd
index 13766383566..74e947f46c9 100644
--- a/inputmethod/skkfep/patches/patch-bd
+++ b/inputmethod/skkfep/patches/patch-bd
@@ -1,8 +1,16 @@
-$NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
+$NetBSD: patch-bd,v 1.2 2012/12/20 21:50:47 joerg Exp $
 
---- fep.c.orig	Tue Jul  7 00:31:16 1998
-+++ fep.c	Tue Dec 21 00:42:53 1999
-@@ -219,7 +219,6 @@
+--- fep.c.orig	1998-07-06 15:31:16.000000000 +0000
++++ fep.c
+@@ -105,6 +105,7 @@ kanjicode2string(code)
+     }
+ }
+ 
++void setEscape(EscapeBehavior b);
+ 
+ main(argc,argv,envp)
+ int	argc;
+@@ -219,7 +220,6 @@ options:\n\
  	/* Initialize */
  	setKanaKey();
  	getTCstr();
@@ -10,7 +18,7 @@ $NetBSD: patch-bd,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  	get_winsize();
  	set_tty();
  	set_int();
-@@ -308,7 +307,7 @@
+@@ -308,7 +308,7 @@ char *s;
  			break;
  		}
  	}
diff --git a/inputmethod/skkfep/patches/patch-be b/inputmethod/skkfep/patches/patch-be
index a7eacb8a21d..75f1ae48e85 100644
--- a/inputmethod/skkfep/patches/patch-be
+++ b/inputmethod/skkfep/patches/patch-be
@@ -1,8 +1,8 @@
-$NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
+$NetBSD: patch-be,v 1.2 2012/12/20 21:50:47 joerg Exp $
 
---- readwrite.c.orig	Tue Jul  7 00:31:15 1998
-+++ readwrite.c	Sun Sep 27 10:24:06 1998
-@@ -4,6 +4,14 @@
+--- readwrite.c.orig	1998-07-06 15:31:15.000000000 +0000
++++ readwrite.c
+@@ -4,10 +4,21 @@
  #include "kanjicode.h"
  #include "ctrlcode.h"
  
@@ -17,7 +17,14 @@ $NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  #ifdef DEBUG
  extern FILE *wrlog;
  #endif
-@@ -29,12 +37,10 @@
+ 
++static void convCode(unsigned char c1, unsigned char c2, unsigned char *obuf,
++    kanjicode ic, kanjicode oc);
++
+ kanjicode OutCode = NATIVECODE, WriteCode = NATIVECODE;
+ 
+ typedef struct KanjiStatus {
+@@ -29,22 +40,16 @@ struct code_mode codeMode[8] = {
  	SIC_B,SOC_B,"JIS",3,3,
  };
  
@@ -31,7 +38,32 @@ $NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  		return c;
  	return EOF;
  }
-@@ -320,13 +326,13 @@
+ 
+-checkStatusAndConvCode(c,ic,oc,stat,ostat,optr,olen)
+-char c;
+-kanjicode ic,oc;
+-KanjiStatus stat,ostat;
+-char **optr;
+-int *olen;
++static void checkStatusAndConvCode(char c, kanjicode ic, kanjicode oc,
++    KanjiStatus stat, KanjiStatus ostat, char **optr, int *olen)
+ {
+ 	static char buf[6];
+ 
+@@ -201,10 +206,8 @@ int *olen;
+ 	}
+ }
+ 
+-syncStatus(ttyno,ic,oc,istatus,ostatus)
+-int ttyno;
+-kanjicode ic,oc;
+-KanjiStatus istatus,ostatus;
++static void syncStatus(int ttyno, kanjicode ic, kanjicode oc,
++    KanjiStatus istatus, KanjiStatus ostatus)
+ {
+ 	if (!isJIS(oc) || istatus->kanjiMode == ostatus->kanjiMode)
+ 			return;
+@@ -320,13 +323,13 @@ writes(s)
  char    *s;
  {       int    l = strlen(s);
  	
@@ -47,7 +79,7 @@ $NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  }
  
  writeShTty(s,l)
-@@ -334,14 +340,14 @@
+@@ -334,14 +337,14 @@ char	*s;
  int	l;
  {
  
@@ -64,3 +96,16 @@ $NetBSD: patch-be,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  }
  
  
+@@ -376,10 +379,8 @@ bell()
+ 	write1('\007');
+ }
+ 
+-convCode(c1,c2,obuf,ic,oc)
+-unsigned char c1,c2;
+-unsigned char *obuf;
+-kanjicode ic,oc;
++static void convCode(unsigned char c1, unsigned char c2, unsigned char *obuf,
++    kanjicode ic, kanjicode oc)
+ {
+ 	if (ic == oc || (isJIS(ic) && isJIS(oc)) ) {
+ 		obuf[0] = c1;
diff --git a/inputmethod/skkfep/patches/patch-bf b/inputmethod/skkfep/patches/patch-bf
index b5e49156c22..376e4ef6f29 100644
--- a/inputmethod/skkfep/patches/patch-bf
+++ b/inputmethod/skkfep/patches/patch-bf
@@ -1,7 +1,7 @@
-$NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
+$NetBSD: patch-bf,v 1.2 2012/12/20 21:50:47 joerg Exp $
 
---- stty.c.orig	Wed Sep 23 01:22:53 1998
-+++ stty.c	Sun Sep 27 10:21:12 1998
+--- stty.c.orig	1998-09-22 16:22:53.000000000 +0000
++++ stty.c
 @@ -31,12 +31,15 @@
  
  #endif
@@ -19,7 +19,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  #ifdef TIOCSWINSZ
  struct winsize  d_winsize;
  #endif /* TIOCSWINSZ */
-@@ -142,7 +145,7 @@
+@@ -142,7 +145,7 @@ get_winsize()
  #ifdef TIOCSWINSZ
  	extern int lines, columns;
  
@@ -28,7 +28,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  	if (d_winsize.ws_col == 0) {
  		d_winsize.ws_col = columns;
  	} else {
-@@ -153,7 +156,7 @@
+@@ -153,7 +156,7 @@ get_winsize()
  	} else {
  		lines = d_winsize.ws_row;
  	}
@@ -37,7 +37,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  #endif /* TIOCSWINSZ */
  }
  
-@@ -161,7 +164,7 @@
+@@ -161,7 +164,7 @@ set_tty()
  {	int	er;
  	TERMPARAM ioval;
  
@@ -46,7 +46,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  	ioval = d_ioval;
  
  #if defined TERMIOS || defined TERMIO
-@@ -195,7 +198,7 @@
+@@ -195,7 +198,7 @@ set_tty()
  	ioval.m_ttyb.sg_flags = RAW;
  #endif
  
@@ -55,7 +55,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  
  	initFep();
  
-@@ -208,14 +211,8 @@
+@@ -208,14 +211,8 @@ set_tty()
  
  reset_tty()
  {
@@ -71,7 +71,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  }
  
  set_tty_sane(tty)
-@@ -258,12 +255,6 @@
+@@ -258,12 +255,6 @@ int tty;
  	}
  }
  
@@ -84,7 +84,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  SignalFunc
  reset_exit()
  {
-@@ -315,7 +306,7 @@
+@@ -315,7 +306,7 @@ chld_changed()
  	union wait statusp;
  #endif
  
@@ -93,7 +93,7 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  	while ((cpid = wait((int *)&statusp)) != -1 && cpid != ShellPID)
  		;
  #else
-@@ -385,7 +376,7 @@
+@@ -385,7 +376,7 @@ term_exit()
  SignalFunc
  suspend()
  {
@@ -102,3 +102,12 @@ $NetBSD: patch-bf,v 1.1.1.1 2002/05/31 13:00:04 seb Exp $
  	signal(SIGTSTP,SIG_DFL);
  	kill(0,SIGTSTP);
  
+@@ -467,6 +458,8 @@ set_int()
+ 	signal(SIGUSR2,sig_usr2);
+ }
+ 
++void closeSKK(Dictionary dic, char *dicname);
++
+ saveJisyo()
+ {
+ #ifdef USE_SERVER
diff --git a/inputmethod/skkfep/patches/patch-jc.c b/inputmethod/skkfep/patches/patch-jc.c
new file mode 100644
index 00000000000..e59f51bc89b
--- /dev/null
+++ b/inputmethod/skkfep/patches/patch-jc.c
@@ -0,0 +1,23 @@
+$NetBSD: patch-jc.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+
+--- jc.c.orig	2012-12-20 14:34:34.000000000 +0000
++++ jc.c
+@@ -105,6 +105,8 @@ ConvRoutine ToSJ[] = {
+ 	{'P',cConvPS,"",""},
+ };
+ 
++static void conv(char *is, char *os, char fc, char tc);
++
+ FILE	*file_open(),*popen();
+ 
+ main(argc,argv)
+@@ -232,8 +234,7 @@ char	**argv,fromCode,toCode;
+ 	}
+ }
+ 
+-conv(is,os,fc,tc)
+-char	*is,*os,fc,tc;
++static void conv(char *is, char *os, char fc, char tc)
+ {	static uchar	mbuf[BF_SIZ];
+ 	int		i;
+ 
diff --git a/inputmethod/skkfep/patches/patch-keybind.c b/inputmethod/skkfep/patches/patch-keybind.c
new file mode 100644
index 00000000000..204875deac9
--- /dev/null
+++ b/inputmethod/skkfep/patches/patch-keybind.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-keybind.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+
+--- keybind.c.orig	2012-12-20 14:38:47.000000000 +0000
++++ keybind.c
+@@ -58,8 +58,7 @@ setKanaKey()
+     KAlphaInputKeymap[k] = kfFix;
+ }
+ 
+-setEscape(b)
+-EscapeBehavior b;
++void setEscape(EscapeBehavior b)
+ {
+     if (b == ToggleEsc) return;
+     if (b == NoEsc) {
diff --git a/inputmethod/skkfep/patches/patch-kkconv.c b/inputmethod/skkfep/patches/patch-kkconv.c
new file mode 100644
index 00000000000..7ca3ff01c43
--- /dev/null
+++ b/inputmethod/skkfep/patches/patch-kkconv.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-kkconv.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+
+--- kkconv.c.orig	2012-12-20 14:39:31.000000000 +0000
++++ kkconv.c
+@@ -29,6 +29,9 @@ LearnMode NetLearnMode = NET_LEARN_MODE;
+ static void putOkuri();
+ void showCand();
+ 
++void inputKanaConso(char c, void (*output)(),void (*flush)());
++void flushLastConso(char *c, void (*output)(), void (*flush)());
++
+ static void
+ bufferedInput(s)
+ char *s;
diff --git a/inputmethod/skkfep/patches/patch-romkan-org.c b/inputmethod/skkfep/patches/patch-romkan-org.c
new file mode 100644
index 00000000000..e641beb2d06
--- /dev/null
+++ b/inputmethod/skkfep/patches/patch-romkan-org.c
@@ -0,0 +1,37 @@
+$NetBSD: patch-romkan-org.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+
+--- romkan-org.c.orig	2012-12-20 14:39:27.000000000 +0000
++++ romkan-org.c
+@@ -187,6 +187,9 @@ char *modeString[] = {
+ 	"単語選択",
+ };
+ 
++void inputKanaConso(char c, void (*output)(),void (*flush)());
++void flushLastConso(char *c, void (*output)(), void (*flush)());
++
+ void writeShells(),flushOut();
+ 
+ void
+@@ -261,10 +264,7 @@ void (*output)();
+ 	Nconso = 0;
+ }
+ 
+-inputKanaConso(c,output,flush)
+-char c;
+-void (*output)();
+-void (*flush)();
++void inputKanaConso(char c, void (*output)(),void (*flush)())
+ {
+ 	char notOverwrite = 0;
+ 	switch (c) {
+@@ -356,9 +356,7 @@ void (*flush)();
+ 	write1(c);
+ }
+ 
+-flushLastConso(c,output,flush)
+-char c;
+-void (*output)(),(*flush)();
++void flushLastConso(char *c, void (*output)(), void (*flush)())
+ {
+         if (Nconso == 0) {
+ 		return;
diff --git a/inputmethod/skkfep/patches/patch-simpledic.c b/inputmethod/skkfep/patches/patch-simpledic.c
new file mode 100644
index 00000000000..77d4f53716e
--- /dev/null
+++ b/inputmethod/skkfep/patches/patch-simpledic.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-simpledic.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+
+--- simpledic.c.orig	2012-12-20 14:41:29.000000000 +0000
++++ simpledic.c
+@@ -3,6 +3,8 @@
+ #include <sys/types.h>
+ #include "skklib.h"
+ 
++void closeSKK(Dictionary dic, char *dicname);
++
+ main() 
+ {
+ 	Dictionary dic;
diff --git a/inputmethod/skkfep/patches/patch-skklib.c b/inputmethod/skkfep/patches/patch-skklib.c
new file mode 100644
index 00000000000..07790ae8b88
--- /dev/null
+++ b/inputmethod/skkfep/patches/patch-skklib.c
@@ -0,0 +1,35 @@
+$NetBSD: patch-skklib.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+
+--- skklib.c.orig	2012-12-20 14:41:31.000000000 +0000
++++ skklib.c
+@@ -15,6 +15,8 @@ static char *allocStr();
+ /* char *malloc(); */
+ int hashVal();
+ 
++static void mergeDictionary(Dictionary dic, char *dicname);
++
+ /*
+  * Open SKK
+  */
+@@ -235,9 +237,7 @@ int okuri;
+ 	return citem0;
+ }
+ 
+-closeSKK(dic,dicname)
+-Dictionary dic;
+-char *dicname;
++void closeSKK(Dictionary dic, char *dicname)
+ {
+ 	char *buf;
+ 	FILE *f;
+@@ -301,9 +301,7 @@ char *dicname;
+ 
+ /* #define DEBUG_MERGE /* debug dictionary merge */
+ 
+-mergeDictionary(dic,dicname)
+-Dictionary dic;
+-char *dicname;
++static void mergeDictionary(Dictionary dic, char *dicname)
+ {
+ 	FILE *f;
+ 	CandList cand,dcand;
diff --git a/inputmethod/skkfep/patches/patch-terms.c b/inputmethod/skkfep/patches/patch-terms.c
new file mode 100644
index 00000000000..7b409fd874e
--- /dev/null
+++ b/inputmethod/skkfep/patches/patch-terms.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-terms.c,v 1.1 2012/12/20 21:50:47 joerg Exp $
+
+--- terms.c.orig	2012-12-20 14:38:09.000000000 +0000
++++ terms.c
+@@ -124,7 +124,7 @@ getTCstr()
+ 	}
+ }
+ 
+-setEnvirons()
++void setEnvirons(void)
+ {
+ 	extern char *version;
+ 	char buf[1024], *p, *q, *e, c1, c2;