[uim commit] r5130 - trunk/uim

[codesite-noreply]

Author: yamakenz
Date: Mon Jan 14 10:05:02 2008
New Revision: 5130
Modified:
  trunk/uim/uim-notify.c
  trunk/uim/uim-notify.h

Log:
* uim/uim-notify.h
* uim/uim-notify.c
 - Replace C++-style 'uim_notify_desc*' with traditional C-style
   'uim_notify_desc *'. See bug #1483 for my opinion about it


Modified: trunk/uim/uim-notify.c
==============================================================================
--- trunk/uim/uim-notify.c      (original)
+++ trunk/uim/uim-notify.c      Mon Jan 14 10:05:02 2008
@@ -59,7 +59,7 @@
static void uim_notify_load_stderr(void);

/* builtin notify module */
-static const uim_notify_desc* uim_notify_stderr_get_desc(void);
+static const uim_notify_desc *uim_notify_stderr_get_desc(void);
static int uim_notify_stderr_init(void);
static void uim_notify_stderr_quit(void);
static int uim_notify_stderr_info(const char *);
@@ -71,14 +71,14 @@
  "Standard Error output",
};

-static const uim_notify_desc* (*uim_notify_get_desc_func)(void) = 
uim_notify_stderr_get_desc;
+static const uim_notify_desc *(*uim_notify_get_desc_func)(void) = 
uim_notify_stderr_get_desc;
static int (*uim_notify_init_func)(void) = uim_notify_stderr_init;
static void (*uim_notify_quit_func)(void) = uim_notify_stderr_quit;
static int (*uim_notify_info_func)(const char *) = uim_notify_stderr_info;
static int (*uim_notify_fatal_func)(const char *) = uim_notify_stderr_fatal;

static void *notify_dlhandle = NULL;
-static const uim_notify_desc* notify_desc = &uim_notify_stderr_desc;
+static const uim_notify_desc *notify_desc = &uim_notify_stderr_desc;

static void
uim_notify_load_stderr(void)
@@ -123,7 +123,7 @@
      uim_notify_load_stderr();
      return 0;
    }
-    uim_notify_get_desc_func = (const uim_notify_desc* (*)(void))dlfunc(notify_dlhandle, 
"uim_notify_plugin_get_desc");
+    uim_notify_get_desc_func = (const 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);
@@ -165,7 +165,7 @@
  return 1;
}

-const uim_notify_desc*
+const uim_notify_desc *
uim_notify_get_desc(void)
{
  return uim_notify_get_desc_func();
@@ -220,9 +220,9 @@
  DIR *dirp;
  struct dirent *dp;
  size_t plen, slen;
-  const uim_notify_desc* desc;
+  const uim_notify_desc *desc;
  void *handle;
-  uim_notify_desc* (*desc_func)(void);
+  uim_notify_desc *(*desc_func)(void);
  char *str;

  plen = strlen(NOTIFY_PLUGIN_PREFIX);
@@ -251,7 +251,7 @@
        fprintf(stderr, "load failed %s(%s)\n", path, str);
        continue;
      }
-      desc_func = (uim_notify_desc* (*)(void))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", path);
        dlclose(handle);
@@ -318,7 +318,7 @@
/*
 * builtin functions
 */
-static const uim_notify_desc*
+static const uim_notify_desc *
uim_notify_stderr_get_desc(void)
{
  return &uim_notify_stderr_desc;

Modified: trunk/uim/uim-notify.h
==============================================================================
--- trunk/uim/uim-notify.h      (original)
+++ trunk/uim/uim-notify.h      Mon Jan 14 10:05:02 2008
@@ -54,14 +54,14 @@
int uim_notify_load(const char *name);

/* API for notification facility users */
-const uim_notify_desc* uim_notify_get_desc(void);
+const uim_notify_desc *uim_notify_get_desc(void);
int uim_notify_info(const char *msg_fmt, ...);
int uim_notify_fatal(const char *msg_fmt, ...);

-/* API for pluggable notification mechanism providers */
+/* API for pluggable notification agent implementors */
int uim_notify_plugin_init(void);
void uim_notify_plugin_quit(void);
-const uim_notify_desc* uim_notify_plugin_get_desc(void);
+const uim_notify_desc *uim_notify_plugin_get_desc(void);
int uim_notify_plugin_info(const char *msg);
int uim_notify_plugin_fatal(const char *msg);