Author: ek.kato
Date: Tue Apr 8 02:53:44 2008
New Revision: 5399
Modified:
trunk/uim/m17nlib.c
trunk/uim/plugin.c
trunk/uim/skk.c
Log:
* uim/m17nlib (get_input_method_name) : Remove unused variable.
* uim/plugin.c
- Add #include <sys/param.h> for MAXPATHLEN.
- (plugin_load) : Remove unused variable and fix a bug in r5397.
* uim/skk.c
- Add #include <sys/param.h> for MAXPATHLEN.
- Remove unused <pwd.h> inclusion in r5397.
- (open_lock) : Remove unused variable.
- (skk_save_personal_dictionary) : Ditto.
Modified: trunk/uim/m17nlib.c
==============================================================================
--- trunk/uim/m17nlib.c (original)
+++ trunk/uim/m17nlib.c Tue Apr 8 02:53:44 2008
@@ -436,7 +436,7 @@
static uim_lisp
get_input_method_name(uim_lisp nth_)
{
- int len, nth;
+ int nth;
char name[BUFSIZ];
nth = C_INT(nth_);
Modified: trunk/uim/plugin.c
==============================================================================
--- trunk/uim/plugin.c (original)
+++ trunk/uim/plugin.c Tue Apr 8 02:53:44 2008
@@ -46,6 +46,7 @@
#include <fcntl.h>
#include <errno.h>
#include <pwd.h>
+#include <sys/param.h>
#include "uim.h"
#include "uim-scm.h"
@@ -103,8 +104,7 @@
void (*plugin_instance_init)(void);
void (*plugin_instance_quit)(void);
- size_t len;
-
+ plugin_lib_filename[0] = plugin_scm_filename[0] = '\0';
plugin_name = REFER_C_STR(_name);
if (plugin_name == NULL) {
@@ -174,7 +174,7 @@
DPRINTFN(UIM_VLEVEL_PLUGIN, (stderr, "Calling plugin_instance_init()
for %s.\n", plugin_name));
(plugin_instance_init)();
- if (plugin_scm_filename) {
+ if (plugin_scm_filename[0] != '\0') {
uim_bool succeeded;
succeeded = uim_scm_require_file(plugin_scm_filename);
Modified: trunk/uim/skk.c
==============================================================================
--- trunk/uim/skk.c (original)
+++ trunk/uim/skk.c Tue Apr 8 02:53:44 2008
@@ -50,7 +50,7 @@
#include <errno.h>
#include <sys/socket.h>
#include <netdb.h>
-#include <pwd.h>
+#include <sys/param.h>
#ifdef HAVE_STRINGS_H
#include <strings.h>
#endif
@@ -2840,7 +2840,7 @@
static int
open_lock(const char *name, int type)
{
- int fd, len;
+ int fd;
struct flock fl;
char lock_fn[MAXPATHLEN];
@@ -3188,7 +3188,7 @@
char tmp_fn[MAXPATHLEN];
struct skk_line *sl;
struct stat st;
- int len, lock_fd = -1;
+ int lock_fd = -1;
mode_t umask_val;
if (!skk_dic || skk_dic->cache_modified == 0)
