[uim commit] r5703 - trunk/emacs

[codesite-noreply]

Author: sasugaanija
Date: Tue Jan  6 06:45:33 2009
New Revision: 5703

Modified:
   trunk/emacs/context.c
   trunk/emacs/encoding.c
   trunk/emacs/im.c
   trunk/emacs/prop.c

Log:
* emacs/im.c
* emacs/encoding.c
* emacs/prop.c
* emacs/context.c
 - Remove needless NULL check



Modified: trunk/emacs/context.c
==============================================================================
--- trunk/emacs/context.c       (original)
+++ trunk/emacs/context.c       Tue Jan  6 06:45:33 2009
@@ -102,7 +102,7 @@
   encoding = get_im_encoding(im);

   /* update IM name */
-  if (ua->im) free(ua->im);
+  free(ua->im);

   if (im)
        ua->im = strdup(im);
@@ -124,7 +124,7 @@
        debug_printf(DEBUG_NOTE,
                                 "different encoding %s %s\n", ua->encoding, 
encoding);

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

        update_context_encoding(ua);
@@ -384,12 +384,12 @@
   debug_printf(DEBUG_NOTE, "update_context_configuration\n");

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

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

-  if (ua->encoding) free(ua->encoding);
+  free(ua->encoding);
   ua->encoding = 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 06:45:33 2009
@@ -104,7 +104,7 @@
   im_enc = search_im_encoding(im);

   if (im_enc != NULL) {
-       if (im_enc->encoding) free(im_enc->encoding);
+       free(im_enc->encoding);

        if (encoding)
          im_enc->encoding = strdup(encoding);

Modified: trunk/emacs/im.c
==============================================================================
--- trunk/emacs/im.c    (original)
+++ trunk/emacs/im.c    Tue Jan  6 06:45:33 2009
@@ -45,7 +45,7 @@
 void
 update_default_engine(const char *engine_name)
 {
-  if (default_engine_name) free(default_engine_name);
+  free(default_engine_name);
   default_engine_name = strdup(engine_name);

   default_engine_updated = 1;

Modified: trunk/emacs/prop.c
==============================================================================
--- trunk/emacs/prop.c  (original)
+++ trunk/emacs/prop.c  Tue Jan  6 06:45:33 2009
@@ -58,7 +58,7 @@

   prop->valid = 1;

-  if (prop->list != NULL) free(prop->list);
+  free(prop->list);

   prop->list = strdup(str);