clean-up very old code. gcc4 no longer complains

This commit is contained in:
espie 2010-05-19 14:05:37 +00:00
parent b77a1896a9
commit 4f27f665d7
16 changed files with 257 additions and 0 deletions

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-conf_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- conf.c.orig Wed May 19 15:54:43 2010
+++ conf.c Wed May 19 15:54:49 2010
@@ -7,6 +7,7 @@ History:
931120 extracted from onewlib.c
///////////////////////////////////////////////////////////////////////*/
#include <stdio.h>
+#include <string.h>
#include "onew.h"
typedef struct {

View File

@ -0,0 +1,10 @@
$OpenBSD: patch-dialogue_getincode_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- dialogue/getincode.c.orig Wed May 19 15:56:30 2010
+++ dialogue/getincode.c Wed May 19 15:56:36 2010
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <ctype.h>
+#include <string.h>
#include "onew.h"
/*

View File

@ -0,0 +1,8 @@
$OpenBSD: patch-dialogue_jiscode_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- dialogue/jiscode.c.orig Wed May 19 15:58:57 2010
+++ dialogue/jiscode.c Wed May 19 15:59:03 2010
@@ -1,3 +1,4 @@
+#include <stdio.h>
#include "onew.h"
/*

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-dialogue_jisyo_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- dialogue/jisyo.c.orig Wed May 19 15:56:58 2010
+++ dialogue/jisyo.c Wed May 19 15:57:07 2010
@@ -1,3 +1,5 @@
+#include <string.h>
+#include <stdio.h>
#include "onew.h"
int OM_JisyoMode;

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-dialogue_onewdic_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- dialogue/onewdic.c.orig Wed May 19 15:57:13 2010
+++ dialogue/onewdic.c Wed May 19 15:57:34 2010
@@ -18,6 +18,9 @@ Description:
History:
940127 created
///////////////////////////////////////////////////////////////////////*/
+#include <string.h>
+#include <stdlib.h>
+#include <stdio.h>
#include "onew.h"
int ONEW_MAXWORDS = 32;

View File

@ -0,0 +1,9 @@
$OpenBSD: patch-dialogue_selector_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- dialogue/selector.c.orig Wed May 19 15:56:41 2010
+++ dialogue/selector.c Wed May 19 15:56:52 2010
@@ -1,3 +1,5 @@
+#include <stdio.h>
+#include <string.h>
#include "onew.h"
extern ONEW_THRU_MODE;

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-engine_CannaRk_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- engine/CannaRk.c.orig Wed May 19 16:00:31 2010
+++ engine/CannaRk.c Wed May 19 16:00:38 2010
@@ -25,6 +25,7 @@ int ONEW_kanamode;
#include <ctype.h>
#include <stdio.h>
+#include <string.h>
#include <canna/RK.h>
#include <canna/jrkanji.h>

View File

@ -0,0 +1,38 @@
$OpenBSD: patch-engine_Canna_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- engine/Canna.c.orig Wed Jun 28 18:13:26 1995
+++ engine/Canna.c Wed May 19 16:02:05 2010
@@ -24,6 +24,8 @@ int KanakanExists;
#include <canna/RK.h>
#include <canna/jrkanji.h>
+#include <string.h>
+#include <stdio.h>
#include "onew.h"
#include "Canna_euc.h"
@@ -35,6 +37,8 @@ static int CID;
static int nbunsetsu;
int ONEW_CannarcDone;
+static void disp_kanji_buf(int);
+
static ONEWkanakan_ready()
{ char path[1024];
char dics[1024];
@@ -102,7 +106,6 @@ static ONEWkanakan(startch, yomi)
int comch;
int rcode;
char yomibuf[1024];
- static disp_kanji_buf();
Onew_setupYomistr(startch,yomi,yomibuf);
yomi = yomibuf;
@@ -182,7 +185,7 @@ static ONEWexternal_henkan()
{
}
-static disp_kanji_buf(so)
+static void disp_kanji_buf(so)
{ char kanji[1024];
char left[1024],cur[1024],right[1024];
int curbi,bi;

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-engine_WnnRomkan_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- engine/WnnRomkan.c.orig Wed May 19 16:04:14 2010
+++ engine/WnnRomkan.c Wed May 19 16:04:22 2010
@@ -21,6 +21,7 @@ History:
int RomkanExists;
#include <stdio.h>
+#include <string.h>
#include WNN_RKSPCL
#include "onew.h"

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-engine_Wnn_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- engine/Wnn.c.orig Wed May 19 16:04:00 2010
+++ engine/Wnn.c Wed May 19 16:04:07 2010
@@ -26,6 +26,7 @@ int KanakanExists;
#include <stdio.h>
#include <jlib.h>
#include <ctype.h>
+#include <string.h>
#include "onew.h"
#include "Wnn_euc.h"

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-interface_ouimessage_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- interface/ouimessage.c.orig Wed May 19 15:55:45 2010
+++ interface/ouimessage.c Wed May 19 15:56:15 2010
@@ -1,6 +1,8 @@
/*
* MESSAGE OUTPUT TO APPLICATION USER INTERFACE
*/
+#include <string.h>
+#include <stdio.h>
char *Onew_RK_smode();
char *romkan_help();

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-onew_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- onew.c.orig Wed May 19 16:00:54 2010
+++ onew.c Wed May 19 16:01:16 2010
@@ -26,7 +26,8 @@ History:
#include <signal.h>
#include <ctype.h>
#include <stdio.h>
-extern char *getenv();
+#include <stdlib.h>
+#include <string.h>
#include "onew.h"
int on_via;

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-onewclient_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- onewclient.c.orig Wed May 19 15:58:17 2010
+++ onewclient.c Wed May 19 15:58:30 2010
@@ -21,6 +21,8 @@ History:
///////////////////////////////////////////////////////////////////////*/
#include <signal.h>
+#include <unistd.h>
+#include <stdio.h>
#include "onew.h"
static int onew_DBG = 1;

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-onewcodes_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- onewcodes.c.orig Wed May 19 15:54:43 2010
+++ onewcodes.c Wed May 19 15:55:07 2010
@@ -4,6 +4,7 @@
*/
#include <stdio.h>
+#include <string.h>
#include "onew.h"
#define GOTO_NJIS "\033$B"

View File

@ -0,0 +1,67 @@
$OpenBSD: patch-onewlib_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- onewlib.c.orig Sun Jul 2 09:55:41 1995
+++ onewlib.c Wed May 19 15:54:13 2010
@@ -19,6 +19,7 @@
#define STATIC static
#include <stdio.h>
+#include <string.h>
#include <ctype.h>
#include "onew.h"
@@ -101,7 +102,12 @@ enq_keyinQ(c){ return strQenq(rawc_inbuff,c); }
deq_keyinQ(){ return strQdeq(rawc_inbuff); }
ready_keyinQ(){ return rawc_inbuff[0] != 0; }
+static int definedKanamode(unsigned char);
+static void romkan_modesw();
char *romkan_cmode();
+static void thru_char1(int);
+static Onew_kakuteiInRomkan(int);
+
int ONEW_getch_asis; /* never interpret as command keys */
ONEW_getch0(asis){
@@ -116,9 +122,6 @@ ONEW_getch0(asis){
}
ONEW_getch1(){
int ch;
- static definedKanamode();
- static romkan_modesw();
- static thru_char1();
for(;;){
ch = ONEW_getch0(ONEW_getch_asis);
@@ -180,7 +183,7 @@ static IFUNC KanamodeSw[128];
static int kanamodes[16];
static int kanamodex;
-static definedKanamode(ch)
+static int definedKanamode(ch)
unsigned char ch;
{ IFUNC func;
@@ -198,13 +201,13 @@ Onew_defineKanamode(mode,ch,func)
}
-static romkan_modesw(){
+static void romkan_modesw(){
int cmode;
cmode = ONEW_getch1();
romkan_mode_switch(cmode);
}
-static thru_char1(ch){
+static void thru_char1(ch){
ins_keyinQ(ch);
ins_keyinQ(ONEW_I_THRU_NEXTCH);
}
@@ -313,7 +316,6 @@ Onew_RK_init(){
kget_char1(){
unsigned int kc;
- static Onew_kakuteiInRomkan();
if( !Onew_RK_init() ){
kc = OnewGetchar();

View File

@ -0,0 +1,11 @@
$OpenBSD: patch-onewmisc_c,v 1.1 2010/05/19 14:05:37 espie Exp $
--- onewmisc.c.orig Wed May 19 15:54:43 2010
+++ onewmisc.c Wed May 19 15:55:00 2010
@@ -5,6 +5,7 @@
char *getenv();
#include <ctype.h>
#include <stdio.h>
+#include <string.h>
#include "onew.h"
char *Onew_env_substitute(istr,ostr)