Rename arguments to avoid shadowing global variables

ok fgsch@

diff --git a/bin/pax/ar_io.c b/bin/pax/ar_io.c
index cfbbea5..ac9b5b4 100644 (file)
--- a/bin/pax/ar_io.c
+++ b/bin/pax/ar_io.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: ar_io.c,v 1.40 2012/12/04 02:24:45 deraadt Exp $      */
+/*     $OpenBSD: ar_io.c,v 1.41 2014/01/08 04:42:24 guenther Exp $     */
 /*     $NetBSD: ar_io.c,v 1.5 1996/03/26 23:54:13 mrg Exp $    */
 
 /*-
@@ -1243,7 +1243,7 @@ ar_next(void)
  * to keep the fd the same in the calling function (parent).
  */
 void
-ar_start_gzip(int fd, const char *gzip_program, int wr)
+ar_start_gzip(int fd, const char *path, int wr)
 {
        int fds[2];
        const char *gzip_flags;
@@ -1274,8 +1274,8 @@ ar_start_gzip(int fd, const char *gzip_program, int wr)
                }
                close(fds[0]);
                close(fds[1]);
-               if (execlp(gzip_program, gzip_program, gzip_flags, (char *)NULL) < 0)
-                       err(1, "could not exec %s", gzip_program);
+               if (execlp(path, path, gzip_flags, (char *)NULL) < 0)
+                       err(1, "could not exec %s", path);
                /* NOTREACHED */
        }
 }

diff --git a/bin/pax/pat_rep.c b/bin/pax/pat_rep.c
index 7a435a6..6e6d782 100644 (file)
--- a/bin/pax/pat_rep.c
+++ b/bin/pax/pat_rep.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: pat_rep.c,v 1.32 2012/12/04 02:24:45 deraadt Exp $    */
+/*     $OpenBSD: pat_rep.c,v 1.33 2014/01/08 04:42:24 guenther Exp $   */
 /*     $NetBSD: pat_rep.c,v 1.4 1995/03/21 09:07:33 cgd Exp $  */
 
 /*-
@@ -208,7 +208,7 @@ rep_add(char *str)
  */
 
 int
-pat_add(char *str, char *chdname)
+pat_add(char *str, char *chdirname)
 {
        PATTERN *pt;
 
@@ -235,7 +235,7 @@ pat_add(char *str, char *chdname)
        pt->plen = strlen(str);
        pt->fow = NULL;
        pt->flgs = 0;
-       pt->chdname = chdname;
+       pt->chdname = chdirname;
 
        if (pathead == NULL) {
                pattail = pathead = pt;