Mercurial > hg > octave-nkf > gnulib-hg
changeset 1588:a6a81f3170d0
remove trailing blanks
author | Jim Meyering <jim@meyering.net> |
---|---|
date | Thu, 31 Dec 1998 16:19:31 +0000 |
parents | 3f067a341196 |
children | 67dd7adf10f6 |
files | lib/argmatch.c lib/argmatch.h |
diffstat | 2 files changed, 24 insertions(+), 24 deletions(-) [+] |
line wrap: on
line diff
--- a/lib/argmatch.c +++ b/lib/argmatch.c @@ -99,7 +99,7 @@ static int __argmatch_internal (const char *arg, const char *const *arglist, - const char *vallist, size_t valsize, + const char *vallist, size_t valsize, int sensitive) { int i; /* Temporary index in ARGLIST. */ @@ -124,7 +124,7 @@ else /* Second nonexact match found. */ if (vallist == NULL - || memcmp (vallist + valsize * matchind, + || memcmp (vallist + valsize * matchind, vallist + valsize * i, valsize)) /* There is a real ambiguity, or we could not desambiguise. */ @@ -218,12 +218,12 @@ VALIST, and VALSIZE are the same as in valid_args */ int __xargmatch_internal (const char *kind, const char *arg, - const char *const *arglist, + const char *const *arglist, const char *vallist, size_t valsize, int sensitive) { int i; - + i = __argmatch_internal (arg, arglist, vallist, valsize, sensitive); if (i >= 0) { @@ -248,7 +248,7 @@ const char *vallist, size_t valsize) { int i; - + for (i = 0 ; arglist [i] ; i++) if (!memcmp (value, vallist + valsize * i, valsize)) return arglist [i]; @@ -283,18 +283,18 @@ values */ static const char *const backup_args[] = { - "no", "none", "off", - "simple", "never", - "existing", "nil", - "numbered", "t", + "no", "none", "off", + "simple", "never", + "existing", "nil", + "numbered", "t", 0 }; static const enum backup_type backup_vals[] = { - none, none, none, - simple, simple, - numbered_existing, numbered_existing, + none, none, none, + simple, simple, + numbered_existing, numbered_existing, numbered, numbered }; @@ -313,14 +313,14 @@ } if ((cp = getenv ("VERSION_CONTROL"))) - backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp, + backup_type = XARGCASEMATCH ("$VERSION_CONTROL", cp, backup_args, backup_vals); if (argc == 2) - backup_type = XARGCASEMATCH (program_name, argv [1], + backup_type = XARGCASEMATCH (program_name, argv [1], backup_args, backup_vals); - printf ("The version control is `%s'\n", + printf ("The version control is `%s'\n", ARGMATCH_TO_ARGUMENT (backup_type, backup_args, backup_vals)); return 0;
--- a/lib/argmatch.h +++ b/lib/argmatch.h @@ -1,4 +1,4 @@ -/* argmatch.c -- find a match for a string in an array +/* argmatch.h -- definitions and prototypes for argmatch.c Copyright (C) 1990, 1998 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify @@ -40,11 +40,11 @@ false ambiguities (i.e., different matches of ARG but corresponding to the same values in VALLIST). */ -int argmatch - PARAMS ((const char *arg, const char *const *arglist, +int argmatch + PARAMS ((const char *arg, const char *const *arglist, const char *vallist, size_t valsize)); -int argcasematch - PARAMS ((const char *arg, const char *const *arglist, +int argcasematch + PARAMS ((const char *arg, const char *const *arglist, const char *vallist, size_t valsize)); # define ARGMATCH(ARG,ARGLIST,VALLIST) \ @@ -57,7 +57,7 @@ /* Report on stderr why argmatch failed. Report correct values. */ -void argmatch_invalid +void argmatch_invalid PARAMS ((const char *kind, const char *value, int problem)); /* Left for compatibility with the old name invalid_arg */ @@ -70,7 +70,7 @@ /* Report on stderr the list of possible arguments. */ void argmatch_valid - PARAMS ((const char *const *arglist, + PARAMS ((const char *const *arglist, const char *vallist, size_t valsize)); # define ARGMATCH_VALID(ARGLIST,VALLIST) \ @@ -80,8 +80,8 @@ /* Returns matches, or, upon error, report explanatory message and exit. */ -int __xargmatch_internal - PARAMS ((const char *kind, +int __xargmatch_internal + PARAMS ((const char *kind, const char *arg, const char *const *arglist, const char *vallist, size_t valsize, int sensitive));