* emacsclient.c (main): Remove unused variables.

  (start_daemon_and_retry_set_socket): Use EXIT_FAILURE.

diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index 469a9c96780f9cbeb1860c2e831a6c128d888b5e..2adb909c64a28292ec220034aab90a47576a2531 100644 (file)
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-29  Juanma Barranquero  <lekktu@gmail.com>
+
+       * emacsclient.c (main): Remove unused variables.
+       (start_daemon_and_retry_set_socket): Use EXIT_FAILURE.
+
 2010-09-25  Ulrich Mueller  <ulm@gentoo.org>
 
        * etags.c (compressors, print_language_names): Support xz compression.

diff --git a/lib-src/emacsclient.c b/lib-src/emacsclient.c
index e8ffbe7c562f48959f57135fe44fe4f9ae21722b..1f96c481129d8b2bd89857c4dc7ede03587bac31 100644 (file)
--- a/lib-src/emacsclient.c
+++ b/lib-src/emacsclient.c
@@ -1476,7 +1476,7 @@ start_daemon_and_retry_set_socket (void)
   else if (dpid < 0)
     {
       fprintf (stderr, "Error: Cannot fork!\n");
-      exit (1);
+      exit (EXIT_FAILURE);
     }
   else
     {
@@ -1576,8 +1576,6 @@ main (int argc, char **argv)
       int i;
       for (i = 0; environ[i]; i++)
         {
-          char *name = xstrdup (environ[i]);
-          char *value = strchr (name, '=');
           send_to_emacs (emacs_socket, "-env ");
           quote_argument (emacs_socket, environ[i]);
           send_to_emacs (emacs_socket, " ");