Author: yamakenz
Date: Tue Jan 15 08:06:44 2008
New Revision: 5132
Modified:
trunk/uim/bsdlook.c
trunk/uim/canna.c
trunk/uim/uim-helper.c
trunk/uim/uim-internal.h
trunk/uim/uim-notify.c
Log:
* uim/uim-internal.h
- (NOTIFY_PLUGIN_PATH, NOTIFY_PLUGIN_PREFIX, NOTIFY_PLUGIN_SUFFIX):
Move to uim-notify.c
* uim/uim-notify.c
- (NOTIFY_PLUGIN_PATH, NOTIFY_PLUGIN_PREFIX, NOTIFY_PLUGIN_SUFFIX):
Moved from uim-internal.c
* uim/canna.c
- (get_unconv_candidate): Revert uim_notify_info() to fprintf()
since only developers should know it
* uim/bsdlook.c
- (look_print_from): Revert uim_notify_info() to fprintf() since
bsdlook.c should not depend on libuim
* uim/uim-helper.c
- Cosmetic change
Modified: trunk/uim/bsdlook.c
==============================================================================
--- trunk/uim/bsdlook.c (original)
+++ trunk/uim/bsdlook.c Tue Jan 15 08:06:44 2008
@@ -404,11 +404,11 @@
for (; front < back && compare(string, front, ctx) == EQUAL; ++front) {
for (; front < back && *front != '\n'; ++front)
if (putchar(*front) == EOF) {
- uim_notify_fatal("bsdlook(print_from): stdout");
+ fprintf(stderr, "print_from: stdout");
return;
}
if (putchar('\n') == EOF) {
- uim_notify_fatal("bsdlook(print_from): stdout");
+ fprintf(stderr, "print_from: stdout");
return;
}
}
Modified: trunk/uim/canna.c
==============================================================================
--- trunk/uim/canna.c (original)
+++ trunk/uim/canna.c Tue Jan 15 08:06:44 2008
@@ -309,7 +309,7 @@
if (len == ERR)
uim_fatal_error("RkGetYomi() failed");
#ifdef UIM_CANNA_DEBUG
- uim_notify_info("yomi: %s", buf);
+ fprintf(stderr, "yomi: %s\n", buf);
#endif
return MAKE_STR(buf);
}
Modified: trunk/uim/uim-helper.c
==============================================================================
--- trunk/uim/uim-helper.c (original)
+++ trunk/uim/uim-helper.c Tue Jan 15 08:06:44 2008
@@ -56,7 +56,8 @@
* uim-notify is disabled since I'm not confident about:
* 1. its stability when low-level error handling is being involved
* 2. whether these errors should be notified to endusers
- * -- 2008-01-15 YamaKen */
+ * -- 2008-01-15 YamaKen
+ */
#define USE_UIM_NOTIFY 0
#if USE_UIM_NOTIFY
Modified: trunk/uim/uim-internal.h
==============================================================================
--- trunk/uim/uim-internal.h (original)
+++ trunk/uim/uim-internal.h Tue Jan 15 08:06:44 2008
@@ -174,10 +174,6 @@
extern JMP_BUF uim_catch_block_env;
#endif
-#define NOTIFY_PLUGIN_PATH LIBDIR "/uim/notify"
-#define NOTIFY_PLUGIN_PREFIX "libuimnotify-"
-#define NOTIFY_PLUGIN_SUFFIX ".so"
-
#ifdef __cplusplus
}
#endif
Modified: trunk/uim/uim-notify.c
==============================================================================
--- trunk/uim/uim-notify.c (original)
+++ trunk/uim/uim-notify.c Tue Jan 15 08:06:44 2008
@@ -51,6 +51,11 @@
#include "uim-internal.h"
#include "uim-notify.h"
+
+#define NOTIFY_PLUGIN_PATH LIBDIR "/uim/notify"
+#define NOTIFY_PLUGIN_PREFIX "libuimnotify-"
+#define NOTIFY_PLUGIN_SUFFIX ".so"
+
#ifndef HAVE_DLFUNC
#define dlfunc(handle, symbol) \
((void (*)(void))(uintptr_t)dlsym((handle), (symbol)))
