[uim commit] r5495 - trunk/uim

Fri, 16 May 2008 20:01:19 -0700 


Author: yamakenz
Date: Fri May 16 20:00:29 2008
New Revision: 5495

Modified:
  trunk/uim/mana.c
  trunk/uim/prime.c
  trunk/uim/skk.c
  trunk/uim/uim-custom.c
  trunk/uim/uim-helper.c

Log:
* uim/uim-custom.c
 - (UIM_EVAL_FSTRING1, UIM_EVAL_FSTRING2, UIM_EVAL_FSTRING3,
   UIM_EVAL_FSTRING4, UIM_EVAL_FSTRING5, uim_custom_broadcast):
   Remove redundant and never executed error handlings for uim_asprintf()
* uim/uim-helper.c
 - (uim_helper_send_message): Ditto
* uim/mana.c
 - (mana_eval): Ditto
* uim/prime.c
 - (prime_send_command, prime_lib_init): Ditto
* uim/skk.c
 - (search_line_from_server): Ditto


Modified: trunk/uim/mana.c
==============================================================================
--- trunk/uim/mana.c    (original)
+++ trunk/uim/mana.c    Fri May 16 20:00:29 2008
@@ -209,10 +209,7 @@
  fflush(log);
#endif

-  if (uim_asprintf(&eval_buf, "'%s", ret_buf) < 0 || eval_buf == NULL) {
-    free(ret_buf);
-    return uim_scm_f();
-  }
+  uim_asprintf(&eval_buf, "'%s", ret_buf);
  ret = uim_scm_eval_c_string(eval_buf);
  free(ret_buf);
  free(eval_buf);

Modified: trunk/uim/prime.c
==============================================================================
--- trunk/uim/prime.c   (original)
+++ trunk/uim/prime.c   Fri May 16 20:00:29 2008
@@ -208,8 +208,7 @@
      return MAKE_STR("error\n\t\n");
  } else {
    char *buf;
-    if (uim_asprintf(&buf, "%s\n", str) < 0 || buf == NULL)
-      return MAKE_STR("");
+    uim_asprintf(&buf, "%s\n", str);
    result = uim_ipc_send_command(&prime_pid, &primer, &primew, prime_command,
                                  buf);
    free(buf);
@@ -241,8 +240,7 @@
    prime_fd = prime_init_ud(prime_ud_path);
    if (prime_fd == -1) {
      unlink(prime_ud_path);
- if (uim_asprintf(&option, "-u %s", prime_ud_path) < 0 || option == NULL) 
-       return uim_scm_f();
+      uim_asprintf(&option, "-u %s", prime_ud_path);
      prime_pid = uim_ipc_open_command_with_option(prime_pid, &primer, &primew,
                                                   prime_command, option);
      free(option);

Modified: trunk/uim/skk.c
==============================================================================
--- trunk/uim/skk.c     (original)
+++ trunk/uim/skk.c     Fri May 16 20:00:29 2008
@@ -750,10 +750,7 @@
    return NULL;
  }

-  if (uim_asprintf(&line, "%s ", idx) < 0 || line == NULL) {
-    skkserv_disconnected(di);
-    return NULL;
-  }
+  uim_asprintf(&line, "%s ", idx);

  if ((nr = read(skkservsock, &r, 1)) == -1 || nr == 0) {
    skkserv_disconnected(di);

Modified: trunk/uim/uim-custom.c
==============================================================================
--- trunk/uim/uim-custom.c      (original)
+++ trunk/uim/uim-custom.c      Fri May 16 20:00:29 2008
@@ -98,10 +98,9 @@
    char *buf; \
    form_size = uim_sizeof_sexp_str(sexp_tmpl, arg1); \
    if (form_size != -1) { \
-      if(uim_asprintf(&buf, sexp_tmpl, arg1) > 0 && buf != NULL) { \
-        UIM_EVAL_STRING_INTERNAL(uc, buf); \
-        free(buf); \
-      } \
+      uim_asprintf(&buf, sexp_tmpl, arg1); \
+      UIM_EVAL_STRING_INTERNAL(uc, buf); \
+      free(buf); \
    } \
  }

@@ -111,10 +110,9 @@
    char *buf; \
    form_size = uim_sizeof_sexp_str(sexp_tmpl, arg1, arg2); \
    if (form_size != -1) { \
- if(uim_asprintf(&buf, sexp_tmpl, arg1, arg2) > 0 && buf != NULL) { \ 
-        UIM_EVAL_STRING_INTERNAL(uc, buf); \
-        free(buf); \
-      } \
+      uim_asprintf(&buf, sexp_tmpl, arg1, arg2); \
+      UIM_EVAL_STRING_INTERNAL(uc, buf); \
+      free(buf); \
    } \
  }

@@ -124,10 +122,9 @@
    char *buf; \
    form_size = uim_sizeof_sexp_str(sexp_tmpl, arg1, arg2, arg3); \
    if (form_size != -1) { \
- if(uim_asprintf(&buf, sexp_tmpl, arg1, arg2, arg3) > 0 && buf != NULL) { \ 
-        UIM_EVAL_STRING_INTERNAL(uc, buf); \
-        free(buf); \
-      } \
+      uim_asprintf(&buf, sexp_tmpl, arg1, arg2, arg3); \
+      UIM_EVAL_STRING_INTERNAL(uc, buf); \
+      free(buf); \
    } \
  }

@@ -137,12 +134,9 @@
    char *buf; \
form_size = uim_sizeof_sexp_str(sexp_tmpl, arg1, arg2, arg3, arg4); \ 
    if (form_size != -1) { \
-      if(uim_asprintf(&buf, sexp_tmpl, arg1, arg2, arg3, arg4) > 0 && \
-         buf != NULL) \
-      { \
-        UIM_EVAL_STRING_INTERNAL(uc, buf); \
-        free(buf); \
-      } \
+      uim_asprintf(&buf, sexp_tmpl, arg1, arg2, arg3, arg4); \
+      UIM_EVAL_STRING_INTERNAL(uc, buf); \
+      free(buf); \
    } \
  }

@@ -152,12 +146,9 @@
    char *buf; \
form_size = uim_sizeof_sexp_str(sexp_tmpl, arg1, arg2, arg3, arg4, arg5); \ 
    if (form_size != -1) { \
- if(uim_asprintf(&buf, sexp_tmpl, arg1, arg2, arg3, arg4, arg5) > 0 && \ 
-         buf != NULL) \
-      { \
-        UIM_EVAL_STRING_INTERNAL(uc, buf); \
-        free(buf); \
-      } \
+      uim_asprintf(&buf, sexp_tmpl, arg1, arg2, arg3, arg4, arg5); \
+      UIM_EVAL_STRING_INTERNAL(uc, buf); \
+      free(buf); \
    } \
  }

@@ -1304,12 +1295,17 @@
  for (sym = custom_syms; *sym; sym++) {
    value = uim_custom_value_as_literal(*sym);
    if (value) {
- if(uim_asprintf(&msg, custom_msg_tmpl, *sym, value) < 0 || msg == NULL) 
-      {
+#if 1
+      uim_asprintf(&msg, custom_msg_tmpl, *sym, value);
+#else
+ /* old behavior: useless since other memory exhaustions disable uim */ 
+      if (asprintf(&msg, custom_msg_tmpl, *sym, value) < 0 || !msg) {
+       free(msg);
        free(value);
        uim_custom_symbol_list_free(custom_syms);
        return UIM_FALSE;
      }
+#endif
      uim_helper_send_message(helper_fd, msg);
      free(msg);
      free(value);

Modified: trunk/uim/uim-helper.c
==============================================================================
--- trunk/uim/uim-helper.c      (original)
+++ trunk/uim/uim-helper.c      Fri May 16 20:00:29 2008
@@ -123,8 +123,7 @@
    return;
#endif

-  if (uim_asprintf(&buf, "%s\n", message) < 0 || buf == NULL)
-    return;
+  uim_asprintf(&buf, "%s\n", message);

  old_sigpipe = signal(SIGPIPE, SIG_IGN);

Reply via email to