summaryrefslogtreecommitdiff
path: root/lib/libc/stdlib/getopt_long.c
diff options
context:
space:
mode:
authorlukem <lukem@NetBSD.org>2001-11-04 13:57:29 +0000
committerlukem <lukem@NetBSD.org>2001-11-04 13:57:29 +0000
commit50f5afd52eec8d6ce98b1d8d5c09c552a944acb4 (patch)
treecf72653694b5db2e1970c2511b3070e39510300c /lib/libc/stdlib/getopt_long.c
parent47577dca93344854b6d0750567dc34693b296025 (diff)
fix WARNS=2 (-Wshadow) warnings
Diffstat (limited to 'lib/libc/stdlib/getopt_long.c')
-rw-r--r--lib/libc/stdlib/getopt_long.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/lib/libc/stdlib/getopt_long.c b/lib/libc/stdlib/getopt_long.c
index 1a06e3fd42f..56417b0e3b6 100644
--- a/lib/libc/stdlib/getopt_long.c
+++ b/lib/libc/stdlib/getopt_long.c
@@ -1,4 +1,4 @@
-/* $NetBSD: getopt_long.c,v 1.12 2001/04/24 09:07:43 joda Exp $ */
+/* $NetBSD: getopt_long.c,v 1.13 2001/11/04 13:57:31 lukem Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: getopt_long.c,v 1.12 2001/04/24 09:07:43 joda Exp $");
+__RCSID("$NetBSD: getopt_long.c,v 1.13 2001/11/04 13:57:31 lukem Exp $");
#endif /* LIBC_SCCS and not lint */
#include "namespace.h"
@@ -127,9 +127,9 @@ gcd(a, b)
* in each block).
*/
static void
-permute_args(nonopt_start, nonopt_end, opt_end, nargv)
- int nonopt_start;
- int nonopt_end;
+permute_args(panonopt_start, panonopt_end, opt_end, nargv)
+ int panonopt_start;
+ int panonopt_end;
int opt_end;
char * const *nargv;
{
@@ -141,16 +141,16 @@ permute_args(nonopt_start, nonopt_end, opt_end, nargv)
/*
* compute lengths of blocks and number and size of cycles
*/
- nnonopts = nonopt_end - nonopt_start;
- nopts = opt_end - nonopt_end;
+ nnonopts = panonopt_end - panonopt_start;
+ nopts = opt_end - panonopt_end;
ncycle = gcd(nnonopts, nopts);
- cyclelen = (opt_end - nonopt_start) / ncycle;
+ cyclelen = (opt_end - panonopt_start) / ncycle;
for (i = 0; i < ncycle; i++) {
- cstart = nonopt_end+i;
+ cstart = panonopt_end+i;
pos = cstart;
for (j = 0; j < cyclelen; j++) {
- if (pos >= nonopt_end)
+ if (pos >= panonopt_end)
pos -= nnonopts;
else
pos += nopts;