xemacs-beta: src/mule-canna.c comparison

comparison src/mule-canna.c @ 1650:34abfb24e891

[xemacs-hg @ 2003-08-28 15:44:04 by james] Fix the C++ build, with many module-specific fixes.

author	james
date	Thu, 28 Aug 2003 15:44:30 +0000
parents	4f4c898836ab
children	de0e5e7132db

comparison

equal deleted inserted replaced

-:9afdad50eaf7
+:34abfb24e891
 #endif /* !CANNA2 */
 extern char *jrKanjiError;
 /* #### is this global really necessary? */
 #define KEYTOSTRSIZE 2048
-static unsigned char key_buffer[KEYTOSTRSIZE];
+static char key_buffer[KEYTOSTRSIZE];
 static char **warning;
 static int canna_empty_info, canna_through_info;
 static int canna_underline;
 static int canna_inhibit_hankakukana;
 static Fixnum   canna_ichiran_revLen;
 static Lisp_Object Vcanna_mode_string;
 static int IRCP_context;
-static Lisp_Object storeResults (unsigned char *, int, jrKanjiStatus *);
+static Lisp_Object storeResults (char *, int, jrKanjiStatus *);
 static Lisp_Object kanjiYomiList (int, int);
 static Lisp_Object CANNA_mode_keys (void);
 #ifdef CANNA_MULE
 static void m2c (unsigned char *, int, unsigned char *);
 len = jrKanjiString (0, XCHAR (ch), key_buffer, KEYTOSTRSIZE, &ks);
 return storeResults (key_buffer, len, &ks);
 }
 static Lisp_Object
-storeResults (unsigned char *buf, int len, jrKanjiStatus *ks)
+storeResults (char *buf, int len, jrKanjiStatus *ks)
 {
 Lisp_Object val = Qnil;
 if (len < 0)
 { /* Error detected */
 val = make_string ((unsigned char*) jrKanjiError, strlen (jrKanjiError));
 }
 else
 {
 /* 確定した文字列 (the confirmed string) */
-Vcanna_kakutei_string = make_string (buf, len);
+Vcanna_kakutei_string = make_string ((unsigned char *) buf, len);
 val = make_int (len);
 /* 確定した文字列の読みの情報...
 	 (info about the reading of the confirmed string) */
 Vcanna_kakutei_yomi = Vcanna_kakutei_romaji = Qnil;
 if (ks->info & KanjiYomiInfo)
 	{
-	  unsigned char *p = buf + len + 1;
+	  char *p = buf + len + 1;
 	  int yomilen = strlen (p);
 	  if (len + yomilen + 1 < KEYTOSTRSIZE)
 	    {
 	      int yomilen2;
-	      Vcanna_kakutei_yomi = make_string (p, yomilen); /* 読み
+	      Vcanna_kakutei_yomi =
-								 (reading) */
+		make_string ((unsigned char *) p, yomilen); /* 読み (reading) */
 	      p += yomilen + 1;
 	      yomilen2 = strlen (p);
 	      if (len + yomilen + yomilen2 + 2 < KEYTOSTRSIZE)
 		{
-		  Vcanna_kakutei_romaji = make_string (p, yomilen2);
+		  Vcanna_kakutei_romaji =
+		    make_string ((unsigned char *) p, yomilen2);
 				/* ローマ字 (romanization) */
 		}
 	    }
 	}
 /* モードの情報 (mode information) */
 Vcanna_mode_string = Qnil;
 if (ks->info & KanjiModeInfo)
 	{
-	  Vcanna_mode_string = make_string (ks->mode, strlen (ks->mode));
+	  Vcanna_mode_string =
+	    make_string (ks->mode, strlen ((const char *) ks->mode));
 	}
 /* その他の情報 (other information) */
 canna_empty_info = (ks->info & KanjiEmptyInfo) ? 1 : 0;
 canna_through_info = (ks->info & KanjiThroughInfo) ? 1 : 0;
 else
 {
 char servername[256];
 CHECK_STRING (server);
-strncpy (servername, XSTRING_DATA (server), XSTRING_LENGTH (server));
+strncpy (servername, (const char *) XSTRING_DATA (server),
+	       XSTRING_LENGTH (server));
 servername[XSTRING_LENGTH (server)] = '\0';
 jrKanjiControl (0, KC_SETSERVERNAME, servername);
 }
 if (NILP (rcfile))
 else
 {
 char rcname[256];
 CHECK_STRING (rcfile);
-strncpy (rcname, XSTRING_DATA (rcfile), XSTRING_LENGTH (rcfile));
+strncpy (rcname, (const char *) XSTRING_DATA (rcfile),
+	       XSTRING_LENGTH (rcfile));
 rcname[XSTRING_LENGTH (rcfile)] = '\0';
 jrKanjiControl (0, KC_SETINITFILENAME, rcname);
 }
 warning = (char **) 0;
 for (p = q = (unsigned char **) warning ; *q ; q++)
 	;
 while (p < q)
 	{
 	  q--;
-	  val = Fcons (make_string (*q, strlen (*q)), val);
+	  val = Fcons (make_string (*q, strlen ((const char *) *q)), val);
 	}
 }
 val = Fcons (val, Qnil);
 if (res == -1)
 {
-val = Fcons (make_string ((unsigned char*) jrKanjiError,
+val = Fcons (make_string ((unsigned char *) jrKanjiError,
 				strlen (jrKanjiError)), val);
 /* イニシャライズで失敗した場合。 (on initialization failure) */
 return Fcons (Qnil, val);
 }
 else
 val = Qnil;
 if (warning)
 {
 for (p = (unsigned char**) warning ; *p ; p++)
 	{
-	  val = Fcons (make_string (*p, strlen (*p)), val);
+	  val = Fcons (make_string (*p, strlen ((const char *) *p)), val);
 	}
 }
 val = Fcons (val, Qnil);
 IRCP_context = -1;
 return val;
 ks.echoStr = XSTRING_DATA (str);
 ks.length = XSTRING_LENGTH (str);
 #else /* CANNA_MULE */
 m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), cbuf);
 ks.echoStr = cbuf;
-ks.length = strlen (cbuf);
+ks.length = strlen ((const char *) cbuf);
 #endif /* CANNA_MULE */
 ksv.ks = &ks;
 len = jrKanjiControl (0, KC_DEFINEKANJI, (char *)&ksv);
 return storeResults (key_buffer, ksv.val, ksv.ks);
 }
 #ifndef CANNA_MULE
 strncpy (key_buffer, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi));
 ks.length = XSTRING_LENGTH (yomi);
 key_buffer[ks.length] = '\0';
 #else /* CANNA_MULE */
-m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), key_buffer);
+m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi),
+(unsigned char *) key_buffer);
 ks.length = strlen (key_buffer);
 #endif /* CANNA_MULE */
 if (NILP (roma))
 {
 	       XSTRING_LENGTH (roma));
 key_buffer[XSTRING_LENGTH (yomi) + 1 + XSTRING_LENGTH (roma)] = '\0';
 ks.mode = (unsigned char *)(key_buffer + XSTRING_LENGTH (yomi) + 1);
 #else /* CANNA_MULE */
 ks.mode = (unsigned char *)(key_buffer + ks.length + 1);
-m2c (XSTRING_DATA (roma), XSTRING_LENGTH (roma), ks.mode);
+m2c (XSTRING_DATA (roma), XSTRING_LENGTH (roma),
+	   (unsigned char *) ks.mode);
 #endif /* CANNA_MULE */
 }
 ks.echoStr = (unsigned char *) key_buffer;
 ksv.buffer = (unsigned char *) key_buffer; /* 返値用 (return value) */
 #ifndef CANNA_MULE
 strncpy (key_buffer, XSTRING_DATA (str), XSTRING_LENGTH (str));
 key_buffer[XSTRING_LENGTH (str)] = '\0';
 #else /* CANNA_MULE */
-m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), key_buffer);
+m2c (XSTRING_DATA (str), XSTRING_LENGTH (str), (unsigned char *) key_buffer);
 #endif /* CANNA_MULE */
 p = (unsigned char**) key_buffer;
 n = jrKanjiControl (0, KC_PARSE,  (char *) &p);
 val = Qnil;
 while (n > 0)
 {
 n--;
-val = Fcons (make_string (p[n], strlen (p[n])), val);
+val = Fcons (make_string (p[n], strlen ((const char *) p[n])), val);
 }
 return val;
 }
 DEFUN ("canna-query-mode", Fcanna_query_mode, 0, 0, 0, /*
 Get current mode string.
 */
 ())
 {
-unsigned char buf[256];
+char buf[256];
 jrKanjiControl (0, KC_QUERYMODE, buf);
-return make_string (buf, strlen (buf));
+return make_string ((unsigned char *) buf, strlen (buf));
 }
 /*
 * Functions following this line are for KKCP interface compatible
 * library.  These functions may be used by MILK system.
 yomibuf[XSTRING_LENGTH (yomi)] = '\0';
 nbun = RkBgnBun (IRCP_context, XSTRING_DATA (yomi), XSTRING_LENGTH (yomi),
 		   (RK_XFER << RK_XFERBITS) | RK_KFER);
 #else /* CANNA_MULE */
 m2c (XSTRING_DATA (yomi), XSTRING_LENGTH (yomi), yomibuf);
-nbun = RkBgnBun (IRCP_context, (char *) yomibuf, strlen (yomibuf),
+nbun = RkBgnBun (IRCP_context, (char *) yomibuf,
+		   strlen ((const char *) yomibuf),
 		   (RK_XFER << RK_XFERBITS) | RK_KFER);
 #endif /* CANNA_MULE */
 return kanjiYomiList (IRCP_context, nbun);
 }
 RkGoTo (IRCP_context, XINT (bunsetsu));
 len = RkGetKanjiList (IRCP_context, RkBuf, RKBUFSIZE);
 p = RkBuf;
 for (i = 0 ; i < len ; i++)
 {
-slen = strlen (p);
+slen = strlen ((const char *) p);
 if (NILP(res))
 	{
 	  endp = res = Fcons (make_string (p, slen), Qnil);
 	}
 else
 mule_make_string (unsigned char *p, int l)
 {
 unsigned char cbuf[4096];
 c2mu (p,l,cbuf);
-return (make_string (cbuf,strlen (cbuf)));
+return (make_string (cbuf, strlen ((const char *) cbuf)));
 }
 /* return the MULE internal string length of EUC string */
 /* Modified by sb to return a character count not byte count. */
 static int

Mercurial > hg > xemacs-beta

comparison src/mule-canna.c @ 1650:34abfb24e891