From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 31 Aug 2006 04:52:03 +0000 (+0000)
Subject: * isapipe.c (isapipe): Rename local s/fd/fd_pair/ to avoid shadowing
X-Git-Tag: cvs-readonly~1950
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=7cfeb4eb50c3d24031d1e711ed34828df737daf6;p=gnulib.git

* isapipe.c (isapipe): Rename local s/fd/fd_pair/ to avoid shadowing
the parameter.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 6f7d25cc2..073b4e5ce 100644
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-30  Jim Meyering  <jim@meyering.net>
+
+	* isapipe.c (isapipe): Rename local s/fd/fd_pair/ to avoid shadowing
+	the parameter.
+
 2006-08-29  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* isapipe.c, isapipe.h: New files.
diff --git a/lib/isapipe.c b/lib/isapipe.c
index 02c11715d..fe885bf43 100644
--- a/lib/isapipe.c
+++ b/lib/isapipe.c
@@ -71,17 +71,17 @@ isapipe (int fd)
 	 && PIPE_LINK_COUNT_MAX != (nlink_t) -1)
       && (S_ISFIFO (st.st_mode) | S_ISSOCK (st.st_mode)))
     {
-      int fd[2];
-      int pipe_result = pipe (fd);
+      int fd_pair[2];
+      int pipe_result = pipe (fd_pair);
       if (pipe_result != 0)
 	return pipe_result;
       else
 	{
 	  struct stat pipe_st;
-	  int fstat_pipe_result = fstat (fd[0], &pipe_st);
+	  int fstat_pipe_result = fstat (fd_pair[0], &pipe_st);
 	  int fstat_pipe_errno = errno;
-	  close (fd[0]);
-	  close (fd[1]);
+	  close (fd_pair[0]);
+	  close (fd_pair[1]);
 	  if (fstat_pipe_result != 0)
 	    {
 	      errno = fstat_pipe_errno;