[uim commit] r5094 - trunk/uim

[codesite-noreply]

Author: yamakenz
Date: Thu Jan  3 09:20:06 2008
New Revision: 5094
Modified:
  trunk/uim/plugin.c
  trunk/uim/uim-notify.c
  trunk/uim/uim-util.c

Log:
* uim/uim-util.c
 - (dlfunc) Add return type cast
 - (uim_scm_notify_get_plugins): Simplify with changed dlfunc() macro

* uim/uim-notify.c
 - (dlfunc) Add return type cast
 - (uim_notify_load): Simplify with changed dlfunc() macro. The (void
   (*)(void)) cast is still remaining for real dlfunc()

* uim/plugin.c
 - (dlfunc) Add return type cast
 - (plugin_load): Simplify with changed dlfunc() macro. The (void
   (*)(void)) cast is still remaining for real dlfunc()


Modified: trunk/uim/plugin.c
==============================================================================
--- trunk/uim/plugin.c  (original)
+++ trunk/uim/plugin.c  Thu Jan  3 09:20:06 2008
@@ -55,7 +55,8 @@
#include "uim-notify.h"

#ifndef HAVE_DLFUNC
-#define dlfunc dlsym
+#define dlfunc(handle, symbol) \
+  ((void (*)(void))(uintptr_t)dlsym((handle), (symbol)))
#endif

#define PLUGIN_PREFIX "libuim-"
@@ -169,9 +170,9 @@
  }

  plugin_instance_init
-    = (void (*)(void))(uintptr_t)dlfunc(library, "uim_plugin_instance_init");
+    = (void (*)(void))dlfunc(library, "uim_plugin_instance_init");
  plugin_instance_quit
-    = (void (*)(void))(uintptr_t)dlfunc(library, "uim_plugin_instance_quit");
+    = (void (*)(void))dlfunc(library, "uim_plugin_instance_quit");
  if (!plugin_instance_init) {
    uim_notify_fatal("%s plugin init failed", plugin_name);
    free(plugin_scm_filename);

Modified: trunk/uim/uim-notify.c
==============================================================================
--- trunk/uim/uim-notify.c      (original)
+++ trunk/uim/uim-notify.c      Thu Jan  3 09:20:06 2008
@@ -52,7 +52,8 @@
#include "uim-notify.h"

#ifndef HAVE_DLFUNC
-#define dlfunc dlsym
+#define dlfunc(handle, symbol) \
+  ((void (*)(void))(uintptr_t)dlsym((handle), (symbol)))
#endif

static uim_notify_desc uim_notify_stderr_desc;
@@ -109,35 +110,35 @@
      uim_notify_load_stderr();
      return 0;
    }
-    uim_notify_get_desc_func = (uim_notify_desc* 
(*)(void))(intptr_t)dlfunc(notify_dlhandle, "uim_notify_plugin_get_desc");
+    uim_notify_get_desc_func = (uim_notify_desc* (*)(void))dlfunc(notify_dlhandle, 
"uim_notify_plugin_get_desc");
    if (!uim_notify_get_desc_func) {
       fprintf(stderr, "uim-notify: cannot 
found 'uim_notify_get_desc()' in %s\n", path);
      dlclose(notify_dlhandle);
      uim_notify_load_stderr();
      return 0;
    }
-    uim_notify_init_func  = (int (*)(void))(intptr_t)dlfunc(notify_dlhandle, 
"uim_notify_plugin_init");
+    uim_notify_init_func  = (int (*)(void))dlfunc(notify_dlhandle, 
"uim_notify_plugin_init");
    if (!uim_notify_init_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_init()' 
in %s\n", path);
      dlclose(notify_dlhandle);
      uim_notify_load_stderr();
      return 0;
    }
-    uim_notify_quit_func  = (void (*)(void))(intptr_t)dlfunc(notify_dlhandle, 
"uim_notify_plugin_quit");
+    uim_notify_quit_func  = (void (*)(void))dlfunc(notify_dlhandle, 
"uim_notify_plugin_quit");
    if (!uim_notify_quit_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_quit()' 
in %s\n", path);
      dlclose(notify_dlhandle);
      uim_notify_load_stderr();
      return 0;
    }
-    uim_notify_info_func  = (int (*)(const char *))(intptr_t)dlfunc(notify_dlhandle, 
"uim_notify_plugin_info");
+    uim_notify_info_func  = (int (*)(const char *))dlfunc(notify_dlhandle, 
"uim_notify_plugin_info");
    if (!uim_notify_info_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_info()' 
in %s\n", path);
      dlclose(notify_dlhandle);
      uim_notify_load_stderr();
      return 0;
    }
-    uim_notify_fatal_func = (int (*)(const char *))(intptr_t)dlfunc(notify_dlhandle, 
"uim_notify_plugin_fatal");
+    uim_notify_fatal_func = (int (*)(const char *))dlfunc(notify_dlhandle, 
"uim_notify_plugin_fatal");
    if (!uim_notify_fatal_func) {
       fprintf(stderr, "uim-notify: cannot found 'uim_notify_fatal()' 
in %s\n", path);
      dlclose(notify_dlhandle);

Modified: trunk/uim/uim-util.c
==============================================================================
--- trunk/uim/uim-util.c        (original)
+++ trunk/uim/uim-util.c        Thu Jan  3 09:20:06 2008
@@ -287,7 +287,8 @@
}

#ifndef HAVE_DLFUNC
-#define dlfunc dlsym
+#define dlfunc(handle, symbol) \
+  ((void (*)(void))(uintptr_t)dlsym((handle), (symbol)))
#endif

static uim_lisp
@@ -326,7 +327,7 @@
        fprintf(stderr, "load failed %s(%s)\n", dp->d_name, str);
        continue;
      }
-      desc_func = (uim_notify_desc* (*)(void))(intptr_t)dlfunc(handle, 
"uim_notify_plugin_get_desc");
+      desc_func = (uim_notify_desc* (*)(void))dlfunc(handle, 
"uim_notify_plugin_get_desc");
      if (!desc_func) {
        fprintf(stderr, "cannot found 'uim_notify_get_desc()' in %s\n", 
dp->d_name);
        dlclose(handle);