* emacsclient.c (main): Don't use uninitialized var.

(IS_ANY_SEP): Remove; unused.
(get_current_dir_name): Add an extern decl.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index e3d7edf94bdc97bfa7bc0291c0b13eec940219cd..07d51ff14bd17c472bb42ebae8b33d0aeb42522e 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,9 @@
+2011-04-16  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * emacsclient.c (main): Don't use uninitialized var.
+       (IS_ANY_SEP): Remove; unused.
+       (get_current_dir_name): Add an extern decl.
+
 2011-04-06  Paul Eggert  <eggert@cs.ucla.edu>
 
        Fix more problems found by GCC 4.6.0's static checks.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index c5231fb9989fd722aec321082fc60f3913a0b0f4..2aabc52e828dde5c1974f95785bcb003332a6133 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -218,10 +218,8 @@ xmalloc (unsigned int size)
 #define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)
 #endif
 #endif
-#ifndef IS_ANY_SEP
-#define IS_ANY_SEP(_c_) (IS_DIRECTORY_SEP (_c_))
-#endif
 
+char *get_current_dir_name (void);
 
 /* Return the current working directory.  Returns NULL on errors.
    Any other returned value must be freed with free.  This is used
@@ -1524,7 +1522,7 @@ start_daemon_and_retry_set_socket (void)
 int
 main (int argc, char **argv)
 {
-  int rl, needlf = 0;
+  int rl = 0, needlf = 0;
   char *cwd, *str;
   char string[BUFSIZ+1];
   int null_socket_name IF_LINT ( = 0);