[uim commit] r4765 - trunk/uim

[codesite-noreply]

Author: yamakenz
Date: Fri Jul 20 12:22:05 2007
New Revision: 4765

Modified:
   trunk/uim/anthy.c
   trunk/uim/uim-func.c
   trunk/uim/uim-scm-abbrev.h

Log:
* uim/uim-scm-abbrev.h
  - (MAKE_STR_DIRECTLY): Fix incorrect func name
* uim/uim-func.c
  - (im_acquire_text): Simplify with MAKE_STR_DIRECTLY()

* uim/anthy.c
  - (get_nth_candidate, get_nth_prediction): Simplify with
    uim_scm_make_str_directly()


Modified: trunk/uim/anthy.c
==============================================================================
--- trunk/uim/anthy.c   (original)
+++ trunk/uim/anthy.c   Fri Jul 20 12:22:05 2007
@@ -156,8 +156,7 @@
 
   buf = malloc(buflen + 1);
   anthy_get_segment(ac, seg, nth, buf, buflen + 1);
-  buf_ = uim_scm_make_str(buf);
-  free(buf);
+  buf_ = uim_scm_make_str_directly(buf);
 
   return buf_;
 }
@@ -267,8 +266,7 @@
 
   buf = malloc(buflen + 1);
   anthy_get_prediction(ac, nth, buf, buflen + 1);
-  buf_ = uim_scm_make_str(buf);
-  free(buf);
+  buf_ = uim_scm_make_str_directly(buf);
 
   return buf_;
 #else

Modified: trunk/uim/uim-func.c
==============================================================================
--- trunk/uim/uim-func.c        (original)
+++ trunk/uim/uim-func.c        Fri Jul 20 12:22:05 2007
@@ -331,7 +331,7 @@
   enum UTextArea text_id;
   enum UTextOrigin origin;
   char *former, *latter, *cv_former, *cv_latter;
-  uim_lisp former_, latter_, ret;
+  uim_lisp former_, latter_;
 
   uc = retrieve_uim_context(uc_);
 
@@ -354,17 +354,14 @@
    * needed.  -- YamaKen 2006-10-07 */
   cv_former = uc->conv_if->convert(uc->inbound_conv, former);
   cv_latter = uc->conv_if->convert(uc->inbound_conv, latter);
-  former_ = (TEXT_EMPTYP(cv_former)) ? uim_scm_null() : MAKE_STR(cv_former);
-  latter_ = (TEXT_EMPTYP(cv_latter)) ? uim_scm_null() : MAKE_STR(cv_latter);
-
-  ret = uim_scm_callf("ustr-new", "oo", former_, latter_);
-
   free(former);
   free(latter);
-  free(cv_former);
-  free(cv_latter);
+  former_
+    = (TEXT_EMPTYP(cv_former)) ? uim_scm_null() : MAKE_STR_DIRECTLY(cv_former);
+  latter_
+    = (TEXT_EMPTYP(cv_latter)) ? uim_scm_null() : MAKE_STR_DIRECTLY(cv_latter);
 
-  return ret;
+  return uim_scm_callf("ustr-new", "oo", former_, latter_);
 }
 
 static uim_lisp

Modified: trunk/uim/uim-scm-abbrev.h
==============================================================================
--- trunk/uim/uim-scm-abbrev.h  (original)
+++ trunk/uim/uim-scm-abbrev.h  Fri Jul 20 12:22:05 2007
@@ -41,7 +41,7 @@
 #define MAKE_BOOL uim_scm_make_bool
 #define MAKE_INT  uim_scm_make_int
 #define MAKE_STR  uim_scm_make_str
-#define MAKE_STR_DIRECTLY make_str_directly
+#define MAKE_STR_DIRECTLY uim_scm_make_str_directly
 #define MAKE_SYM  uim_scm_make_symbol
 #define MAKE_PTR  uim_scm_make_ptr
 #define MAKE_FPTR uim_scm_make_func_ptr