[uim commit] r5186 - trunk/uim

[codesite-noreply]

Author: iratqq
Date: Sun Feb 17 11:01:48 2008
New Revision: 5186

Modified:
  trunk/uim/sj3.c

Log:
* uim/sj3.c
 (uim_sj3_open, uim_sj3_open_with_list, uim_sj3_getkan)
 Replace malloc/strdup to uim_malloc/uim_strdup.


Modified: trunk/uim/sj3.c
==============================================================================
--- trunk/uim/sj3.c     (original)
+++ trunk/uim/sj3.c     Sun Feb 17 11:01:48 2008
@@ -96,8 +96,8 @@
static uim_lisp
uim_sj3_open(uim_lisp sname_, uim_lisp uname_)
{
-  char *sname = strdup(REFER_C_STR(sname_));
-  char *uname = strdup(REFER_C_STR(uname_));
+  char *sname = uim_strdup(REFER_C_STR(sname_));
+  char *uname = uim_strdup(REFER_C_STR(uname_));
  int ret;

  if (!sname || !uname)
@@ -121,8 +121,8 @@
static uim_lisp
uim_sj3_open_with_list(uim_lisp sname_, uim_lisp uname_, uim_lisp dict_list_)
{
-  char *sname = strdup(REFER_C_STR(sname_));
-  char *uname = strdup(REFER_C_STR(uname_));
+  char *sname = uim_strdup(REFER_C_STR(sname_));
+  char *uname = uim_strdup(REFER_C_STR(uname_));
  int dict_num;
  char **dict_list;
  int *err_num = NULL;
@@ -136,10 +136,10 @@

  dict_num = uim_scm_length(dict_list_);

-  dict_list = malloc(sizeof(char *) * dict_num);
+  dict_list = uim_malloc(sizeof(char *) * dict_num);

  for (i = 0; i < dict_num; i++) {
-    dict_list[i] = strdup(REFER_C_STR(uim_scm_car(dict_list_)));
+    dict_list[i] = uim_strdup(REFER_C_STR(uim_scm_car(dict_list_)));
    dict_list_ = CDR(dict_list_);
  }

@@ -237,12 +237,12 @@
    char *yomi_str;
    char *kanji_str;

-    yomi_str = malloc(bun[i].srclen + 1);
+    yomi_str = uim_malloc(bun[i].srclen + 1);
    if (!yomi_str)
      return uim_sj3_internal_error(); /* XXX: fatal */
    strlcpy(yomi_str, (const char *)bun[i].srcstr, bun[i].srclen + 1);

-    kanji_str = malloc(bun[i].destlen + 1);
+    kanji_str = uim_malloc(bun[i].destlen + 1);
    if (!kanji_str)
      return uim_sj3_internal_error(); /* XXX: fatal */
    strlcpy(kanji_str, (const char *)bun[i].deststr, bun[i].destlen + 1);