From cb1d0ef7c91692a70f3628c5b33095e48f325250 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 17 Mar 2011 21:45:18 -0700 Subject: [PATCH] * callproc.c (relocate_fd): Rename locals to avoid shadowing. --- src/ChangeLog | 1 + src/callproc.c | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) 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 * callproc.c (call_process_cleanup): Now static. + (relocate_fd): Rename locals to avoid shadowing. 2011-03-17 Eli Zaretskii 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); -- 2.39.2