From: Paul Eggert <eggert@cs.ucla.edu>
Date: Fri, 18 Mar 2011 04:45:18 +0000 (-0700)
Subject: * callproc.c (relocate_fd): Rename locals to avoid shadowing.
X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~513^2~61
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=cb1d0ef7c91692a70f3628c5b33095e48f325250;p=emacs.git

* callproc.c (relocate_fd): Rename locals to avoid shadowing.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 2271734e707..1d27999b49d 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,7 @@
 2011-03-18  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* callproc.c (call_process_cleanup): Now static.
+	(relocate_fd): Rename locals to avoid shadowing.
 
 2011-03-17  Eli Zaretskii  <eliz@gnu.org>
 
diff --git a/src/callproc.c b/src/callproc.c
index 2fffb9d02a7..04b8aa3332d 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1272,12 +1272,12 @@ relocate_fd (int fd, int minfd)
 #endif
       if (new == -1)
 	{
-	  const char *message1 = "Error while setting up child: ";
+	  const char *message_1 = "Error while setting up child: ";
 	  const char *errmessage = strerror (errno);
-	  const char *message2 = "\n";
-	  emacs_write (2, message1, strlen (message1));
+	  const char *message_2 = "\n";
+	  emacs_write (2, message_1, strlen (message_1));
 	  emacs_write (2, errmessage, strlen (errmessage));
-	  emacs_write (2, message2, strlen (message2));
+	  emacs_write (2, message_2, strlen (message_2));
 	  _exit (1);
 	}
       emacs_close (fd);