From: Paul Eggert <eggert@cs.ucla.edu>
Date: Wed, 17 Nov 2004 01:03:54 +0000 (+0000)
Subject: (getopt_long, _getopt_long_r, getopt_long_only,
X-Git-Tag: v5.3.0~380
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7a4adc026e8007f83a054d1df1e3cef6ae8e1cb;p=thirdparty%2Fcoreutils.git

(getopt_long, _getopt_long_r, getopt_long_only,
_getopt_long_only_r): Argv is now char **, not char *__getopt_argv_const*.
---

diff --git a/lib/getopt1.c b/lib/getopt1.c
index a6fdee5a57..2ceff8ec84 100644
--- a/lib/getopt1.c
+++ b/lib/getopt1.c
@@ -41,19 +41,19 @@
 #endif
 
 int
-getopt_long (int argc, char *__getopt_argv_const *argv, const char *options,
+getopt_long (int argc, char **argv, const char *options,
 	     const struct option *long_options, int *opt_index)
 {
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 0);
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 0, 0);
 }
 
 int
-_getopt_long_r (int argc, char *__getopt_argv_const *argv, const char *options,
+_getopt_long_r (int argc, char **argv, const char *options,
 		const struct option *long_options, int *opt_index,
 		struct _getopt_data *d)
 {
   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
-			     0, d);
+			     0, 0, d);
 }
 
 /* Like getopt_long, but '-' as well as '--' can indicate a long option.
@@ -62,21 +62,19 @@ _getopt_long_r (int argc, char *__getopt_argv_const *argv, const char *options,
    instead.  */
 
 int
-getopt_long_only (int argc, char *__getopt_argv_const *argv,
-		  const char *options,
+getopt_long_only (int argc, char **argv, const char *options,
 		  const struct option *long_options, int *opt_index)
 {
-  return _getopt_internal (argc, argv, options, long_options, opt_index, 1);
+  return _getopt_internal (argc, argv, options, long_options, opt_index, 1, 0);
 }
 
 int
-_getopt_long_only_r (int argc, char *__getopt_argv_const *argv,
-		     const char *options,
+_getopt_long_only_r (int argc, char **argv, const char *options,
 		     const struct option *long_options, int *opt_index,
 		     struct _getopt_data *d)
 {
   return _getopt_internal_r (argc, argv, options, long_options, opt_index,
-			     1, d);
+			     1, 0, d);
 }