[uim commit] r4909 - trunk/uim

[codesite-noreply]

Author: yamakenz
Date: Mon Aug 27 19:43:26 2007
New Revision: 4909

Modified:
   trunk/uim/intl.c
   trunk/uim/plugin.c
   trunk/uim/uim-custom.c
   trunk/uim/uim-scm-sigscheme.c
   trunk/uim/uim-util.c
   trunk/uim/uim.c

Log:
* uim/uim-scm-sigscheme.c
  - (uim_scm_c_bool, uim_scm_symbol_value_int_internal,
    uim_scm_symbol_value_str_internal): Replace deprecated truth
    predicates with newer ones
* uim/uim.c
  - (uim_get_im_short_desc): Ditto
* uim/uim-util.c
  - (c_setenv): Ditto
* uim/plugin.c
  - (plugin_unload_internal): Ditto
* uim/intl.c
  - Include uim-scm-abbrev.h
  - (intl_textdomain, intl_bindtextdomain,
    intl_bind_textdomain_codeset): Ditto
* uim/uim-custom.c
  - (uim_scm_c_str_failsafe): Ditto


Modified: trunk/uim/intl.c
==============================================================================
--- trunk/uim/intl.c    (original)
+++ trunk/uim/intl.c    Mon Aug 27 19:43:26 2007
@@ -46,6 +46,7 @@
 
 #include "gettext.h"
 #include "uim-scm.h"
+#include "uim-scm-abbrev.h"
 
 /* for uim_init_intl_subrs() */
 #include "uim-internal.h"
@@ -62,7 +63,7 @@
 {
   const char *new_domain;
 
-  if (UIM_SCM_FALSEP(domainname)) {
+  if (FALSEP(domainname)) {
     new_domain = textdomain(NULL);
   } else {
     new_domain = textdomain(uim_scm_refer_c_str(domainname));
@@ -78,7 +79,7 @@
 
   domain = uim_scm_refer_c_str(domainname);
 
-  if (UIM_SCM_FALSEP(dirname)) {
+  if (FALSEP(dirname)) {
     new_dir = bindtextdomain(domain, NULL);
   } else {
     new_dir = bindtextdomain(domain, uim_scm_refer_c_str(dirname));
@@ -94,10 +95,10 @@
   uim_lisp current_codeset;
 
   if (!uim_scm_stringp(domainname)
-      || !(uim_scm_stringp(codeset) || UIM_SCM_FALSEP(codeset)))
+      || !(uim_scm_stringp(codeset) || FALSEP(codeset)))
     return uim_scm_f();
 
-  c_codeset = (UIM_SCM_FALSEP(codeset)) ? NULL : uim_scm_refer_c_str(codeset);
+  c_codeset = (FALSEP(codeset)) ? NULL : uim_scm_refer_c_str(codeset);
   c_current_codeset = bind_textdomain_codeset(uim_scm_refer_c_str(domainname),
                                              c_codeset);
   if (c_current_codeset) {

Modified: trunk/uim/plugin.c
==============================================================================
--- trunk/uim/plugin.c  (original)
+++ trunk/uim/plugin.c  Mon Aug 27 19:43:26 2007
@@ -223,12 +223,12 @@
   _name = (uim_lisp)uim_lisp_name;
 
   ret = uim_scm_callf("plugin-list-query-library", "o", _name);
-  if (UIM_SCM_FALSEP(ret))
+  if (FALSEP(ret))
     return uim_scm_f();
   library = uim_scm_c_ptr(ret);
 
   ret = uim_scm_callf("plugin-list-query-instance-quit", "o", _name);
-  if (UIM_SCM_FALSEP(ret))
+  if (FALSEP(ret))
     return uim_scm_f();
   plugin_instance_quit = uim_scm_c_func_ptr(ret);
 

Modified: trunk/uim/uim-custom.c
==============================================================================
--- trunk/uim/uim-custom.c      (original)
+++ trunk/uim/uim-custom.c      Mon Aug 27 19:43:26 2007
@@ -336,7 +336,7 @@
 static char *
 uim_scm_c_str_failsafe(uim_lisp str)
 {
-  return (UIM_SCM_NFALSEP(str)) ? uim_scm_c_str(str) : strdup("");
+  return (uim_scm_truep(str)) ? uim_scm_c_str(str) : strdup("");
 }
 
 static char **

Modified: trunk/uim/uim-scm-sigscheme.c
==============================================================================
--- trunk/uim/uim-scm-sigscheme.c       (original)
+++ trunk/uim/uim-scm-sigscheme.c       Mon Aug 27 19:43:26 2007
@@ -179,7 +179,7 @@
 {
   assert(uim_scm_gc_any_contextp());
 
-  return (UIM_SCM_NFALSEP(val)) ? UIM_TRUE : UIM_FALSE;
+  return (uim_scm_truep(val)) ? UIM_TRUE : UIM_FALSE;
 }
 
 /* can be passed to uim_scm_array2list() */
@@ -539,12 +539,7 @@
   int val;
 
   val_ = uim_scm_symbol_value(symbol_str);
-
-  if (UIM_SCM_NFALSEP(val_)) {
-    val = uim_scm_c_int(val_);
-  } else {
-    val = 0;
-  }
+  val = (uim_scm_truep(val_)) ? uim_scm_c_int(val_) : 0;
 
   return (void *)(intptr_t)val;
 }
@@ -565,12 +560,7 @@
   char *val;
 
   val_ = uim_scm_symbol_value(symbol_str);
-
-  if (UIM_SCM_NFALSEP(val_)) {
-    val = uim_scm_c_str(val_);
-  } else {
-    val = NULL;
-  }
+  val = (uim_scm_truep(val_)) ? uim_scm_c_str(val_) : NULL;
 
   return val;
 }

Modified: trunk/uim/uim-util.c
==============================================================================
--- trunk/uim/uim-util.c        (original)
+++ trunk/uim/uim-util.c        Mon Aug 27 19:43:26 2007
@@ -162,7 +162,7 @@
 {
   const char *name = uim_scm_refer_c_str(name_);
   const char *val = uim_scm_refer_c_str(val_);
-  int overwrite = UIM_SCM_NFALSEP(overwrite_);
+  int overwrite = TRUEP(overwrite_);
   int err;
 
   if (!name || !val) {

Modified: trunk/uim/uim.c
==============================================================================
--- trunk/uim/uim.c     (original)
+++ trunk/uim/uim.c     Mon Aug 27 19:43:26 2007
@@ -986,7 +986,7 @@
 
   protected0 = im = get_nth_im(uc, nth);
   protected1 = short_desc = uim_scm_callf("im-short-desc", "o", im);
-  str = UIM_SCM_FALSEP(short_desc) ? "-" : uim_scm_refer_c_str(short_desc);
+  str = (FALSEP(short_desc)) ? "-" : uim_scm_refer_c_str(short_desc);
 
   UIM_CATCH_ERROR_END();