From: Paul Eggert <eggert@cs.ucla.edu>
Date: Mon, 2 Aug 2004 17:23:19 +0000 (+0000)
Subject: (argmatch, __xargmatch_internal, argmatch_invalid):
X-Git-Tag: v5.3.0~969
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=233d4fe941412085f77aa476332bd1156d73ce19;p=thirdparty%2Fcoreutils.git

(argmatch, __xargmatch_internal, argmatch_invalid):
Use ptrdiff_t, not int, when counting arguments, to allow more
than INT_MAX arguments.
---

diff --git a/lib/argmatch.h b/lib/argmatch.h
index e8bb23c667..8952394fda 100644
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -49,8 +49,8 @@
    false ambiguities (i.e., different matches of ARG but corresponding
    to the same values in VALLIST).  */
 
-int argmatch (char const *arg, char const *const *arglist,
-	      char const *vallist, size_t valsize);
+ptrdiff_t argmatch (char const *arg, char const *const *arglist,
+		    char const *vallist, size_t valsize);
 
 # define ARGMATCH(Arg, Arglist, Vallist) \
   argmatch (Arg, Arglist, (char const *) (Vallist), sizeof *(Vallist))
@@ -63,7 +63,8 @@ extern argmatch_exit_fn argmatch_die;
 
 /* Report on stderr why argmatch failed.  Report correct values. */
 
-void argmatch_invalid (char const *context, char const *value, int problem);
+void argmatch_invalid (char const *context, char const *value,
+		       ptrdiff_t problem);
 
 /* Left for compatibility with the old name invalid_arg */
 
@@ -85,10 +86,10 @@ void argmatch_valid (char const *const *arglist,
 /* Same as argmatch, but upon failure, reports a explanation on the
    failure, and exits using the function EXIT_FN. */
 
-int __xargmatch_internal (char const *context,
-			  char const *arg, char const *const *arglist,
-			  char const *vallist, size_t valsize,
-			  argmatch_exit_fn exit_fn);
+ptrdiff_t __xargmatch_internal (char const *context,
+				char const *arg, char const *const *arglist,
+				char const *vallist, size_t valsize,
+				argmatch_exit_fn exit_fn);
 
 /* Programmer friendly interface to __xargmatch_internal. */