summaryrefslogtreecommitdiff
path: root/net
diff options
context:
space:
mode:
authortron <tron@pkgsrc.org>2006-06-30 18:25:43 +0000
committertron <tron@pkgsrc.org>2006-06-30 18:25:43 +0000
commit1d3a0e7d04f56a9b7eefb87b6dac181b2f8f3b46 (patch)
tree30d828d13a0594ea12e8fa79500d5c99b0ccbedc /net
parent40595e845300fbf110e8c331f4facac0fbaadcdf (diff)
downloadpkgsrc-1d3a0e7d04f56a9b7eefb87b6dac181b2f8f3b46.tar.gz
Rename variable "optreset" to "my_optreset" to avoid conflict with global
variable used by getopt(3).
Diffstat (limited to 'net')
-rw-r--r--net/ipw/distinfo4
-rw-r--r--net/ipw/patches/patch-ab25
2 files changed, 25 insertions, 4 deletions
diff --git a/net/ipw/distinfo b/net/ipw/distinfo
index 8c0a020924b..fd4ab39c347 100644
--- a/net/ipw/distinfo
+++ b/net/ipw/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2005/02/24 12:13:50 agc Exp $
+$NetBSD: distinfo,v 1.6 2006/06/30 18:25:43 tron Exp $
SHA1 (ipw-3.3a.tar.gz) = ca7943d263b9ace3951badeb4189e5aa9c2c8ddd
RMD160 (ipw-3.3a.tar.gz) = 7b159404a1fbd897b2ec1bb9516ab3b1a897345d
Size (ipw-3.3a.tar.gz) = 17238 bytes
SHA1 (patch-aa) = 60cf070bacd1f500ebc666d2947b1153626369b5
-SHA1 (patch-ab) = ff6536717e2ef15e90de61c786d79cb2c59e31c6
+SHA1 (patch-ab) = 91f504acc0c21fea3953518eb64a13b1c876f3dc
diff --git a/net/ipw/patches/patch-ab b/net/ipw/patches/patch-ab
index f2414119b87..dfaad65e0ae 100644
--- a/net/ipw/patches/patch-ab
+++ b/net/ipw/patches/patch-ab
@@ -1,7 +1,28 @@
-$NetBSD: patch-ab,v 1.1 2003/12/15 17:02:22 agc Exp $
+$NetBSD: patch-ab,v 1.2 2006/06/30 18:25:43 tron Exp $
--- ipw.c.orig 1999-03-30 08:04:12.000000000 +0100
-+++ ipw.c 2003-12-15 16:58:12.000000000 +0000
++++ ipw.c 2006-06-30 19:22:53.000000000 +0100
+@@ -257,7 +257,7 @@
+ static int my_opterr = 1; /* if error message should be printed */
+ static int my_optind = 1; /* index into parent argv vector */
+ static int my_optopt; /* character checked for validity */
+-static int optreset; /* reset getopt */
++static int my_optreset; /* reset getopt */
+ static char *my_optarg; /* argument associated with option */
+
+ #define BADCH (int)'?'
+@@ -275,9 +275,9 @@
+ static char *place = EMSG; /* option letter processing */
+ register char *oli = NULL; /* option letter list index */
+
+- if (optreset || ! *place)
++ if (my_optreset || ! *place)
+ { /* update scanning pointer */
+- optreset = 0;
++ my_optreset = 0;
+ if (my_optind >= nargc || *(place = nargv[my_optind]) != '-')
+ {
+ place = EMSG;
@@ -782,7 +782,7 @@
if (!p)
return NULL;