diff src/mule-canna.c @ 197:acd284d43ca1 r20-3b25

Import from CVS: tag r20-3b25
author cvs
date Mon, 13 Aug 2007 10:00:02 +0200
parents e121b013d1f0
children e45d5e7c476e
line wrap: on
line diff
--- a/src/mule-canna.c	Mon Aug 13 09:59:07 2007 +0200
+++ b/src/mule-canna.c	Mon Aug 13 10:00:02 2007 +0200
@@ -195,7 +195,7 @@
 static void m2c (unsigned char *, int, unsigned char *);
 static Lisp_Object mule_make_string (unsigned char *, int);
 static mule_strlen (unsigned char *, int);
-static count_char (unsigned char *,int, int, int, int *, int *, int *);
+static void count_char (unsigned char *,int, int, int, int *, int *, int *);
 #define make_string mule_make_string
 #endif
 
@@ -321,6 +321,8 @@
   kugiri = NILP (num) ? 0 : 1;
 
   jrKanjiControl (0, KC_SETBUNSETSUKUGIRI, (char *) kugiri);
+
+  return Qnil;
 }
 
 /* For whatever reason, calling Fding directly from libCanna loses */
@@ -634,8 +636,6 @@
 */
        (str))
 {
-  jrKanjiStatusWithValue ksv;
-  jrKanjiStatus ks;
   Lisp_Object val;
   unsigned char **p;
   int n;
@@ -723,7 +723,6 @@
        (yomi))
 {
   int nbun;
-  Lisp_Object res;
 
   CHECK_STRING (yomi);
   if (confirmContext () == 0)
@@ -778,7 +777,7 @@
 */
        (bunsetsu))
 {
-  int i, nbun, slen, len;
+  int i, slen, len;
   unsigned char *p, RkBuf[RKBUFSIZE];
   Lisp_Object res = Qnil, endp;
 
@@ -1623,7 +1622,7 @@
 }
 
 /* count number of characters */
-static
+static void
 count_char (unsigned char *p, int len, int pos, int rev, int *clen, int *cpos,
 	    int *crev)
 {