Path: blob/main/japanese/FreeWnn-lib/files/patch-Wnn-etc-sstrings.c
18157 views
Index: Wnn/etc/sstrings.c1===================================================================2RCS file: /home/cvs/private/hrs/freewnn/Wnn/etc/sstrings.c,v3retrieving revision 1.1.1.14retrieving revision 1.25diff -u -p -r1.1.1.1 -r1.26--- Wnn/etc/sstrings.c 20 Dec 2008 07:13:30 -0000 1.1.1.17+++ Wnn/etc/sstrings.c 20 Dec 2008 15:22:40 -0000 1.28@@ -5,7 +5,7 @@9/*10* FreeWnn is a network-extensible Kana-to-Kanji conversion system.11* This file is part of FreeWnn.12- *13+ *14* Copyright Kyoto University Research Institute for Mathematical Sciences15* 1987, 1988, 1989, 1990, 1991, 199216* Copyright OMRON Corporation. 1987, 1988, 1989, 1990, 1991, 1992, 199917@@ -49,77 +49,75 @@ extern int eeuc_to_ieuc ();18extern int ieuc_to_eeuc ();1920int21-wnn_sStrcpy (c, w)22- register char *c;23- register w_char *w;24+wnn_sStrcpy(register char *c,25+ register w_char *w)26{27- register int ret;28+ register int ret;2930- ret = ieuc_to_eeuc (c, w, -1);31- c[ret] = '\0';32- return (ret);33-}34+ ret = ieuc_to_eeuc(c, w, -1);35+ c[ret] = '\0';3637+ return (ret);38+}3940int41-wnn_Sstrcpy (w, c)42- w_char *w;43- unsigned char *c;44+wnn_Sstrcpy(w_char *w,45+ unsigned char *c)46{47- register int ret;48+ register int ret;4950- ret = eeuc_to_ieuc (w, c, -1) / sizeof (w_char);51- w[ret] = (w_char) 0;52- return (ret);53+ ret = eeuc_to_ieuc(w, c, -1) / sizeof(w_char);54+ w[ret] = (w_char)0;55+56+ return (ret);57}5859#ifdef nodef60char *61-wnn_Stos (c)62- w_char *c;63+wnn_Stos(cw_char *c)64{65- char *c1 = (char *) c;66- for (; *c; c++)67- {68- if (ASCIIP (*c))69- {70- *c1++ = *c;71- }72- else73- {74- *c1++ = (*c << 8);75- *c1++ = *c;76- }77- }78- return ((char *) c);79+ char *c1 = (char *)c;80+81+ for (; *c; c++) {82+ if (ASCIIP(*c))83+ *c1++ = *c;84+ else {85+ *c1++ = (*c << 8);86+ *c1++ = *c;87+ }88+ }89+90+ return ((char *) c);91}92#endif9394char *95-wnn_sStrncpy (s1, s2, n)96- register char *s1;97- register w_char *s2;98- register int n;99+wnn_sStrncpy(register char *s1,100+ register char *s2,101+ register int n)102{103- eeuc_to_ieuc (s1, s2, n / sizeof (w_char));104- return s1;105+ eeuc_to_ieuc(s1, s2, n / sizeof(w_char));106+107+ return s1;108}109110#ifdef CHINESE111int112-wnn_Sstrcat (w, c)113- w_char *w;114- unsigned char *c;115+wnn_Sstrcat(w_char *w,116+ unsigned char *c)117{118- w_char *w0 = w;119- register int ret;120+ w_char *w0 = w;121+ register int ret;122+123+ if (!c || !*c)124+ return (0);125+126+ for (; *w; w++);127+128+ ret = eeuc_to_ieuc(w, c, strlen (c)) / sizeof(w_char);129+ w[ret] = (w_char)0;130+ ret += (w - w0);131132- if (!c || !*c)133- return (0);134- for (; *w; w++);135- ret = eeuc_to_ieuc (w, c, strlen (c)) / sizeof (w_char);136- w[ret] = (w_char) 0;137- ret += (w - w0);138- return (ret);139+ return (ret);140}141#endif142143144