Fix return types.

2 files changed, 49 insertions, 1 deletions

diff --git a/inputmethod/skktools/distinfo b/inputmethod/skktools/distinfo
index d7f49a77953..7d591986e18 100644
--- a/inputmethod/skktools/distinfo
+++ b/inputmethod/skktools/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.2 2011/12/03 09:22:37 sbd Exp $
+$NetBSD: distinfo,v 1.3 2013/03/28 21:28:12 joerg Exp $
 
 SHA1 (skktools-1.3.1.tar.gz) = 13939bf5533a7d2711724e98ea4dae99a7eac01b
 RMD160 (skktools-1.3.1.tar.gz) = 506ee66cab8d302d267436be36e24aeab8cc7d76
 Size (skktools-1.3.1.tar.gz) = 290215 bytes
 SHA1 (patch-Makefile.in) = e0fd23040781df6dcab97ade30f6f04a373eeee3
+SHA1 (patch-skkdic-expr.c) = 36a07ca9bd0cdc33aecd54f90dc07495c9ea3bbf
diff --git a/inputmethod/skktools/patches/patch-skkdic-expr.c b/inputmethod/skktools/patches/patch-skkdic-expr.c
new file mode 100644
index 00000000000..dfd271f4767
--- /dev/null
+++ b/inputmethod/skktools/patches/patch-skkdic-expr.c
@@ -0,0 +1,47 @@
+$NetBSD: patch-skkdic-expr.c,v 1.1 2013/03/28 21:28:12 joerg Exp $
+
+--- skkdic-expr.c.orig	2013-03-27 12:46:31.000000000 +0000
++++ skkdic-expr.c
+@@ -328,9 +328,7 @@ static void append_item(base, s, e)
+ /* 各送りがなエントリは、"わりこmみ"のようなキーを持ち、
+  * その値は、"/割り込/割込/"となる
+  */
+-static char *add_okuri_item(key, s)
+-     datum 		*key;
+-     unsigned char 	*s;
++static void add_okuri_item(datum *key, unsigned char *s)
+ {
+     unsigned char	*p, *headtop;
+     unsigned char	keybuf[BLEN];
+@@ -547,9 +545,7 @@ delete_item(base, s, e)
+ /* 各送りがなエントリは、"わりこmみ"のようなキーを持つことになる
+  * その値は、"/割り込/割込/"となる
+  */
+-static char *subtract_okuri_item(key, s)
+-     datum 		*key;
+-     unsigned char 	*s;
++static void subtract_okuri_item(datum *key, unsigned char *s)
+ {
+     unsigned char	*p, *headtop;
+     unsigned char	keybuf[BLEN];
+@@ -597,8 +593,7 @@ static char *subtract_okuri_item(key, s)
+ 
+ /* tailで指している文字列からlineに含まれる語尾を削除
+  */
+-static int subtract_okuri_tail_line(tails, line)
+-     unsigned char 	*tails, *line;
++static void subtract_okuri_tail_line(unsigned char *tails, unsigned char *line)
+ {
+     unsigned char     	*s, *e;
+ 
+@@ -700,9 +695,7 @@ static void subtract_file(srcname)
+     fclose(fp);
+ }
+ 
+-static int	okuri_type_out(key, output)
+-     datum	*key;
+-     FILE	*output;
++static void	okuri_type_out(datum *key, FILE *output)
+ {
+     unsigned char	*s, *e, *headtop;
+     unsigned char	keybuf[BLEN];