[uim commit] r5706 - trunk/emacs

[codesite-noreply]

Author: iratqq
Date: Tue Jan  6 08:39:36 2009
New Revision: 5706
Modified:
   trunk/emacs/candidate.c
   trunk/emacs/context.c
   trunk/emacs/encoding.c
   trunk/emacs/im.c
   trunk/emacs/preedit.c
   trunk/emacs/prop.c

Log:
* emacs/candidate.c (new_candidate):
* emacs/context.c (switch_context_im, create_uim_agent_context)
  (update_context_configuration):
* emacs/encoding.c (new_im_encoding, set_im_encoding):
* emacs/im.c (update_default_engine):
* emacs/preedit.c (add_preedit):
* emacs/prop.c (update_prop_list, show_prop):
  - Use uim_strdup().


Modified: trunk/emacs/candidate.c
==============================================================================
--- trunk/emacs/candidate.c     (original)
+++ trunk/emacs/candidate.c     Tue Jan  6 08:39:36 2009
@@ -66,8 +66,8 @@
   /* get candidates from context */
   for (i = 0; i < num; i ++) {
        u_cand = uim_get_candidate(context, i, limit ? i % limit : i);
-       cand->cand_array[i].str = strdup(uim_candidate_get_cand_str(u_cand));
-	cand->cand_array[i].label =  
strdup(uim_candidate_get_heading_label(u_cand));
+       cand->cand_array[i].str = 
uim_strdup(uim_candidate_get_cand_str(u_cand));
+	cand->cand_array[i].label =  
uim_strdup(uim_candidate_get_heading_label(u_cand));
        uim_candidate_free(u_cand);
   }


Modified: trunk/emacs/context.c
==============================================================================
--- trunk/emacs/context.c       (original)
+++ trunk/emacs/context.c       Tue Jan  6 08:39:36 2009
@@ -105,7 +105,7 @@
   free(ua->im);

   if (im)
-       ua->im = strdup(im);
+       ua->im = uim_strdup(im);
   else
        ua->im = NULL;

@@ -125,7 +125,7 @@
                                 "different encoding %s %s\n", ua->encoding, 
encoding);

        free(ua->encoding);
-       ua->encoding = strdup(encoding);
+       ua->encoding = uim_strdup(encoding);

        update_context_encoding(ua);
        update_context_im(ua);
@@ -220,18 +220,18 @@
   ret = uim_malloc(sizeof(uim_agent_context));

   if (encoding) {
-       ret->encoding = strdup(encoding);
+       ret->encoding = uim_strdup(encoding);
   } else {
        if (debug_level > 0)
-         ret->encoding = strdup("EUC-JP");
+         ret->encoding = uim_strdup("EUC-JP");
        else
-         ret->encoding = strdup("UTF-8");
+         ret->encoding = uim_strdup("UTF-8");
   }

   ret->context = create_context(ret->encoding, ret);

   if ((im = uim_get_default_im_name(setlocale(LC_ALL, NULL))))
-       ret->im = strdup(im);
+       ret->im = uim_strdup(im);
   else
        ret->im = NULL;

@@ -385,12 +385,12 @@

   /* update IM name */
   free(ua->im);
-  ua->im = strdup(uim_get_current_im_name(ua->context));
+  ua->im = uim_strdup(uim_get_current_im_name(ua->context));

   debug_printf(DEBUG_NOTE, "ua->im %s\n", ua->im);

   free(ua->encoding);
-  ua->encoding = strdup(get_im_encoding(ua->im));
+  ua->encoding = uim_strdup(get_im_encoding(ua->im));

   debug_printf(DEBUG_NOTE, "ua->encoding %s\n", ua->encoding);


Modified: trunk/emacs/encoding.c
==============================================================================
--- trunk/emacs/encoding.c      (original)
+++ trunk/emacs/encoding.c      Tue Jan  6 08:39:36 2009
@@ -68,10 +68,10 @@

   debug_printf(DEBUG_NOTE, "new_im_encoding\n");

-  im_enc->im = strdup(im);
+  im_enc->im = uim_strdup(im);

   if (encoding != NULL)
-       im_enc->encoding = strdup( encoding );
+       im_enc->encoding = uim_strdup( encoding );
   else
        im_enc->encoding = NULL;

@@ -107,7 +107,7 @@
        free(im_enc->encoding);

        if (encoding)
-         im_enc->encoding = strdup(encoding);
+         im_enc->encoding = uim_strdup(encoding);
        else
          im_enc->encoding = NULL;


Modified: trunk/emacs/im.c
==============================================================================
--- trunk/emacs/im.c    (original)
+++ trunk/emacs/im.c    Tue Jan  6 08:39:36 2009
@@ -46,7 +46,7 @@
 update_default_engine(const char *engine_name)
 {
   free(default_engine_name);
-  default_engine_name = strdup(engine_name);
+  default_engine_name = uim_strdup(engine_name);

   default_engine_updated = 1;
 }

Modified: trunk/emacs/preedit.c
==============================================================================
--- trunk/emacs/preedit.c       (original)
+++ trunk/emacs/preedit.c       Tue Jan  6 08:39:36 2009
@@ -65,7 +65,7 @@
   }

   if (strlen(str) > 0) {
-       pb->str = strdup(str);
+       pb->str = uim_strdup(str);
        pe->length += strlen(str);
   } else {
        pb->str = NULL;

Modified: trunk/emacs/prop.c
==============================================================================
--- trunk/emacs/prop.c  (original)
+++ trunk/emacs/prop.c  Tue Jan  6 08:39:36 2009
@@ -60,7 +60,7 @@

   free(prop->list);

-  prop->list = strdup(str);
+  prop->list = uim_strdup(str);

   prop->list_update = 1;
 }
@@ -106,7 +106,7 @@

   a_printf(" ( l ");

-  head = buf = strdup(prop->list);
+  head = buf = uim_strdup(prop->list);

 #define PART_BRANCH "branch"
 #define PART_LEAF   "leaf"