home  bbs  files  messages ]

      ZZLI4416             linux.debian.bugs.dist             15094 messages      

[ previous | next | reply ]

[ list messages | list forums ]

  Msg # 66 of 15094 on ZZLI4416, Monday 10-12-25, 1:12  
  From: ADRIAN BUNK  
  To: ALL  
  Subj: Bug#1098198: zh-autoconvert: diff for NM  
 [continued from previous message] 
  
 +Index: zh-autoconvert/hzconvert/b2u.c 
 +=================================================================== 
 +--- zh-autoconvert.orig/hzconvert/b2u.c 
 ++++ zh-autoconvert/hzconvert/b2u.c 
 +@@ -36,8 +36,7 @@ extern int BtoU_count, UtoB_count; 
 + #define c1 (unsigned char)(s[0]) 
 + #define c2 (unsigned char)(s[1]) 
 + 
 +-static void b2u(s, t) 
 +-     register char *s, *t; 
 ++static void b2u(char* s, char* t) 
 + { 
 +   register unsigned int i; 
 + /* 
 +@@ -60,8 +59,7 @@ static void b2u(s, t) 
 + // t[0] = BtoU_bad1;  t[1] = BtoU_bad2; 
 + } 
 + 
 +-static void u2b(s, t) 
 +-     register char *s, *t; 
 ++static void u2b(char* s, char* t) 
 + { 
 +  register long int i = ((c1 << 8) + c2) * 2; 
 + 
 +@@ -74,8 +72,7 @@ static void u2b(s, t) 
 + static char big2uni_savec[MAX_MODULE]; 
 + static char uni2big_savec[MAX_MODULE]; 
 + 
 +-int big2uni_init (arg) 
 +-     char *arg; 
 ++int big2uni_init (char* arg) 
 + { 
 + /* 
 +   static int big2uni_inst = 0; 
 +@@ -90,8 +87,7 @@ int big2uni_init (arg) 
 +         return (i++); 
 + } 
 + 
 +-int uni2big_init (arg) 
 +-     char *arg; 
 ++int uni2big_init (char* arg) 
 + { 
 + /* 
 +   static int uni2big_inst = 0; 
 +@@ -105,10 +101,7 @@ int uni2big_init (arg) 
 +         return (i++); 
 + } 
 + 
 +-char *big2uni (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *big2uni (char* s, int* plen, int inst) 
 + { 
 +   char buf[MAX_BUFFER*2]; /* big enough */ 
 +   char *s_start = s; 
 +@@ -145,10 +138,7 @@ char *big2uni (s,plen,inst) 
 +  return s_start; 
 + } 
 + 
 +-char *uni2big (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *uni2big (char* s, int* plen, int inst) 
 + { 
 +   char buf[MAX_BUFFER*2]; /* big enough */ 
 +   char *s_start = s; 
 +Index: zh-autoconvert/hzconvert/g2u.c 
 +=================================================================== 
 +--- zh-autoconvert.orig/hzconvert/g2u.c 
 ++++ zh-autoconvert/hzconvert/g2u.c 
 +@@ -36,8 +36,7 @@ extern int GtoU_count, UtoG_count; 
 + #define c1 (unsigned char)(s[0]) 
 + #define c2 (unsigned char)(s[1]) 
 + 
 +-static void g2u(s, t) 
 +-     register char *s, *t; 
 ++static void g2u(char* s, char* t) 
 + { 
 +   register unsigned int i; 
 + 
 +@@ -55,8 +54,7 @@ static void g2u(s, t) 
 +  t[0] = GtoU_bad1;  t[1] = GtoU_bad2; 
 + } 
 + 
 +-static void u2g(s, t) 
 +-     register char *s, *t; 
 ++static void u2g(char* s, char* t) 
 + { 
 +   register long int i = ((c1 << 8) + c2) * 2; 
 + 
 +@@ -69,8 +67,7 @@ static void u2g(s, t) 
 + static char gb2uni_savec[MAX_MODULE]; 
 + static char uni2gb_savec[MAX_MODULE]; 
 + 
 +-int gb2uni_init (arg) 
 +-     char *arg; 
 ++int gb2uni_init (char* arg) 
 + { 
 + /* 
 +   static int gb2uni_inst = 0; 
 +@@ -86,8 +83,7 @@ int gb2uni_init (arg) 
 +         return (gb2uni_inst++); 
 + } 
 + 
 +-int uni2gb_init (arg) 
 +-     char *arg; 
 ++int uni2gb_init (char* arg) 
 + { 
 + /* 
 +   static int uni2gb_inst = 0; 
 +@@ -102,10 +98,7 @@ int uni2gb_init (arg) 
 +         return (uni2gb_inst++); 
 + } 
 + 
 +-char *gb2uni (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *gb2uni (char* s, int* plen, int inst) 
 + { 
 +   char buf[MAX_BUFFER*2]; /* big enough */ 
 +   char *s_start = s; 
 +@@ -142,10 +135,7 @@ char *gb2uni (s,plen,inst) 
 +  return s_start; 
 + } 
 + 
 +-char *uni2gb (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *uni2gb (char* s, int* plen, int inst) 
 + { 
 +   char buf[MAX_BUFFER*2]; /* big enough */ 
 +   char *s_start = s; 
 +Index: zh-autoconvert/hzconvert/hz2gb.c 
 +=================================================================== 
 +--- zh-autoconvert.orig/hzconvert/hz2gb.c 
 ++++ zh-autoconvert/hzconvert/hz2gb.c 
 +@@ -42,9 +42,7 @@ Boston, MA  02111-1307, USA. 
 + static int state[MAX_MODULE]; 
 + static int eoln[MAX_MODULE]; 
 + 
 +-static char hzdecode(c, inst) 
 +-     char c; 
 +-     int inst; /* instant number */ 
 ++static char hzdecode(char c, int inst) 
 + { 
 +  switch (state[inst]) { 
 +    case S_ASC: 
 +@@ -127,10 +125,7 @@ static char hzdecode(c, inst) 
 + 
 + 
 + 
 +-char *hz2gb (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *hz2gb (char* s,int* plen,int inst) 
 + { 
 +   int i; 
 + 
 +@@ -141,10 +136,7 @@ char *hz2gb (s,plen,inst) 
 +  return (s); 
 + } 
 + 
 +-char *gb2hz (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *gb2hz (char* s,int* plen, int inst) 
 + { 
 +   register int i; 
 + 
 +@@ -153,8 +145,7 @@ char *gb2hz (s,plen,inst) 
 +  return (s); 
 + } 
 + 
 +-int hz2gb_init (arg) 
 +-     char *arg; 
 ++int hz2gb_init (char* arg) 
 + { 
 + /* 
 +   static hz2gb_inst = 0; 
 +Index: zh-autoconvert/hzconvert/unicode.c 
 +=================================================================== 
 +--- zh-autoconvert.orig/hzconvert/unicode.c 
 ++++ zh-autoconvert/hzconvert/unicode.c 
 +@@ -29,10 +29,7 @@ Boston, MA  02111-1307, USA. 
 + 
 + /*** UTF8 => UNICODE ***/ 
 + 
 +-static int u8toun(p, len, pu1, pu2) 
 +-    unsigned char *p; 
 +-    int len; 
 +-    unsigned char *pu1, *pu2; 
 ++static int u8toun(unsigned char* p, int len, unsigned char *pu1, unsigned 
 char *pu2) 
 + { 
 +   register unsigned char c1 = p[0], c2 = p[1], c3 = p[2]; 
 + 
 +@@ -69,8 +66,7 @@ static int u8toun(p, len, pu1, pu2) 
 + 
 + static char utf8_uni_savec[MAX_MODULE][2]; 
 + 
 +-int utf8_uni_init (arg) 
 +-     char *arg; 
 ++int utf8_uni_init (char* arg) 
 + { 
 + /* 
 +   static int utf8_uni_inst = 0; 
 +@@ -90,10 +86,7 @@ int utf8_uni_init (arg) 
 + 
 + #define CODE_ERROR 0x80 
 + 
 +-char *utf8_uni (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *utf8_uni (char* s, int* plen, int inst) 
 + { 
 +   char buf[MAX_BUFFER*3]; 
 +   char *s_start = s; 
 +@@ -146,8 +139,7 @@ char *utf8_uni (s,plen,inst) 
 + static char uni_utf8_savec[MAX_MODULE]; 
 + static char uni_utf8_saved[MAX_MODULE]; 
 + 
 +-int uni_utf8_init (arg) 
 +-     char *arg; 
 ++int uni_utf8_init (char* arg) 
 + { 
 + /* 
 +   static int uni_utf8_inst = 0; 
 +@@ -162,10 +154,7 @@ int uni_utf8_init (arg) 
 +  return (i++); 
 + } 
 + 
 +-char *uni_utf8 (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *uni_utf8 (char* s, int* plen, int inst) 
 + { 
 +   char buf[MAX_BUFFER*3]; 
 +   char *s_start = s; 
 +@@ -253,10 +242,10 @@ struct utf7_context { 
 +     unsigned long bit_buffer; 
 + }; 
 + 
 +-static int u7toun(c, pu1, pu2, ctx) /* return 1 if a unicode is produced 
 */ 
 +-    unsigned char c;  /* a char in utf7 stream */ 
 +-    unsigned char *pu1, *pu2; /* the unicode */ 
 +-    struct utf7_context *ctx; /* the context */ 
 ++/* c: a char in utf7 stream */ 
 ++/* pu1, pu2: the unicode */ 
 ++/* ctx: the context */ 
 ++static int u7toun(unsigned char c, unsigned char *pu1, unsigned char *pu2, 
 struct utf7_context *ctx) /* return 1 if a unicode is produced */ 
 + { 
 +  if (ctx->state == IN_ASCII) { 
 +   if (c == '+') { 
 +@@ -301,10 +290,7 @@ static int u7toun(c, pu1, pu2, ctx) /* r 
 +  return 0; 
 + } 
 + 
 +-static int untou7(u1, u2, s, ctx) /* return the # of char written to s */ 
 +-    unsigned char u1, u2; /* the unicode */ 
 +-    unsigned char *s;  /* store here */ 
 +-    struct utf7_context *ctx; /* the context */ 
 ++static int untou7(unsigned char u1, unsigned char u2, unsigned char *s, 
 struct utf7_context *ctx) /* return the # of char written to s */ 
 + { 
 +   unsigned char *prev_s = s; 
 + 
 +@@ -344,8 +330,7 @@ static int untou7(u1, u2, s, ctx) /* ret 
 + 
 + static struct utf7_context utf7_uni_context[MAX_MODULE]; 
 + 
 +-int utf7_uni_init (arg) 
 +-     char *arg; 
 ++int utf7_uni_init (char *arg) 
 + { 
 + /* 
 +   static int utf7_uni_inst = 0; 
 +@@ -366,10 +351,7 @@ int utf7_uni_init (arg) 
 +  return (i++); 
 + } 
 + 
 +-char *utf7_uni (s,plen,inst) 
 +-     char *s; 
 +-     int *plen; 
 +-     int inst; 
 ++char *utf7_uni (char *s, int *plen, int inst) 
 + { 
  
 [continued in next message] 
  
 --- SoupGate-Win32 v1.05 
  * Origin: you cannot sedate... all the things you hate (1:229/2) 

[ list messages | list forums | previous | next | reply ]

search for:

328,100 visits
(c) 1994,  bbs@darkrealms.ca