[uim commit] r4831 - trunk/uim

[codesite-noreply]

Author: yamakenz
Date: Sat Aug 11 11:17:09 2007
New Revision: 4831

Modified:
   trunk/uim/uim-error.c
   trunk/uim/uim-func.c
   trunk/uim/uim-util.c

Log:
* uim/uim-util.c
  - (setugidp): Simplify

* uim/uim-error.c
  - (uim_strdup): Cosmetic change

* uim/uim-func.c
  - (im_pushback_preedit): Ditto


Modified: trunk/uim/uim-error.c
==============================================================================
--- trunk/uim/uim-error.c       (original)
+++ trunk/uim/uim-error.c       Sat Aug 11 11:17:09 2007
@@ -161,19 +161,19 @@
 char *
 uim_strdup(const char *s)
 {
-    char *copied;
+  char *copied;
 
 #if HAVE_STRDUP
-    copied = strdup(s);
-    if (!copied)
-      uim_fatal_error("strdup() failed");
+  copied = strdup(s);
+  if (!copied)
+    uim_fatal_error("strdup() failed");
 #else
-    size_t size;
+  size_t size;
 
-    size = strlen(s) + sizeof("");
-    copied = uim_malloc(size);
-    strcpy(copied, s);
+  size = strlen(s) + sizeof("");
+  copied = uim_malloc(size);
+  strcpy(copied, s);
 #endif
 
-    return copied;
+  return copied;
 }

Modified: trunk/uim/uim-func.c
==============================================================================
--- trunk/uim/uim-func.c        (original)
+++ trunk/uim/uim-func.c        Sat Aug 11 11:17:09 2007
@@ -112,7 +112,7 @@
 
   converted_str = uc->conv_if->convert(uc->outbound_conv, str);
   if (uc->preedit_pushback_cb)
-      uc->preedit_pushback_cb(uc->ptr, attr, converted_str);
+    uc->preedit_pushback_cb(uc->ptr, attr, converted_str);
   free(converted_str);
 
   return uim_scm_f();

Modified: trunk/uim/uim-util.c
==============================================================================
--- trunk/uim/uim-util.c        (original)
+++ trunk/uim/uim-util.c        Sat Aug 11 11:17:09 2007
@@ -289,10 +289,7 @@
 {
   assert(uim_scm_gc_any_contextp());
 
-  if (uim_issetugid()) {
-    return uim_scm_t();
-  }
-  return uim_scm_f();
+  return uim_scm_make_bool(uim_issetugid());
 }
 
 void