[uim commit] r4822 - trunk/uim

[codesite-noreply]

Author: yamakenz
Date: Sat Aug 11 06:41:11 2007
New Revision: 4822

Modified:
   trunk/uim/iconv.c

Log:
* uim/iconv.c
  - Include assert.h
  - (MBCHAR_LEN_MAX): New macro
  - (check_encoding_equivalence, uim_iconv_is_convertible,
    uim_get_encoding_alias, uim_iconv_open, uim_iconv_create): Add
    precondition assertions
  - (uim_iconv_code_conv): Logical cleanup
  - (uim_iconv_release): Call iconv_close() only if obj is not NULL


Modified: trunk/uim/iconv.c
==============================================================================
--- trunk/uim/iconv.c   (original)
+++ trunk/uim/iconv.c   Sat Aug 11 06:41:11 2007
@@ -36,6 +36,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <iconv.h>
+#include <assert.h>
 
 #ifdef HAVE_ALLOCA_H
 # include <alloca.h>
@@ -46,6 +47,8 @@
 #include "uim-util.h"
 
 
+#define MBCHAR_LEN_MAX 6  /* assumes CESU-8 */
+
 static void *uim_iconv_open(const char *tocode, const char *fromcode);
 static int uim_iconv_is_convertible(const char *tocode, const char *fromcode);
 static void *uim_iconv_create(const char *tocode, const char *fromcode);
@@ -78,6 +81,9 @@
   int alias_fromcode_alloced = 0;
   int found = 0;
 
+  assert(tocode);
+  assert(fromcode);
+
   alias_tocode = uim_get_encoding_alias(tocode);
   alias_fromcode = uim_get_encoding_alias(fromcode);
 
@@ -117,6 +123,9 @@
 {
   iconv_t ic;
 
+  assert(tocode);
+  assert(fromcode);
+
   if (check_encoding_equivalence(tocode, fromcode))
     return 1;
 
@@ -135,6 +144,8 @@
   int i, j;
   const char **alias;
 
+  assert(encoding);
+
   for (i = 0; (alias = uim_encoding_list[i]); i++) {
     for (j = 0; alias[j]; j++) {
       if (!strcmp(alias[j], encoding))
@@ -154,6 +165,9 @@
   int alias_fromcode_alloced = 0;
   int opened = 0;
 
+  assert(tocode);
+  assert(fromcode);
+
   alias_tocode = uim_get_encoding_alias(tocode);
   alias_fromcode = uim_get_encoding_alias(fromcode);
 
@@ -194,6 +208,9 @@
 {
   iconv_t ic;
 
+  assert(tocode);
+  assert(fromcode);
+
   if (check_encoding_equivalence(tocode, fromcode))
     return NULL;
 
@@ -209,32 +226,36 @@
 uim_iconv_code_conv(void *obj, const char *str)
 {
   iconv_t ic;
-  size_t len;
-  size_t buflen;
-  char *realbuf;
-  char *outbuf;
-  const char *inbuf;
+  size_t len, bufsize;
+  char *outbuf, *realbuf;
+  const char *inbuf, *src;
 
-  ic = (iconv_t)obj;
   if (!str)
     return NULL;
 
-  if (!ic)
-    return strdup(str);
+  ic = (iconv_t)obj;
+  if (ic) {
+    len = strlen(str);
+    bufsize = (len + sizeof("")) * MBCHAR_LEN_MAX;
+    realbuf = alloca(bufsize);
+    memset(realbuf, 0, bufsize);
+
+    inbuf = str;
+    outbuf = realbuf;
+    iconv(ic, (ICONV_CONST char **)&inbuf, &len, &outbuf, &bufsize);
+    src = realbuf;
+  } else {
+    src = str;
+  }
 
-  len = strlen(str);
-  buflen = (len * 6)+3;
-  realbuf = alloca(buflen);
-  outbuf = realbuf;
-  inbuf = str;
-  memset(realbuf, 0, buflen);
-  iconv(ic, (ICONV_CONST char **)&inbuf, &len, &outbuf, &buflen);
-  return strdup(realbuf);
+  return strdup(src);
 }
 
 static void
 uim_iconv_release(void *obj)
 {
   int err;
-  err = iconv_close((iconv_t)obj);
+
+  if (obj)
+    err = iconv_close((iconv_t)obj);
 }