CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-07-25 02:06:40 +02:00
Code Issues Projects Releases Wiki Activity

(XARGMATCH): Don't return a value; instead, modify a parameter.

Browse Source 
Add a `Die_stmt' parameter.
Add parentheses.
This commit is contained in:
Jim Meyering
1999-01-02 18:33:08 +00:00
parent fa7427c2ea
commit c7c2516a4d
1 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/argmatch.h
+27 -25
View File
@@ -1,5 +1,5 @@
/* argmatch.h -- definitions and prototypes for argmatch.c
Copyright (C) 1990, 1998 Free Software Foundation, Inc.
Copyright (C) 1990, 1998, 1999 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -48,10 +48,10 @@ int argcasematch
const char *vallist, size_t valsize));
# define ARGMATCH(Arg, Arglist, Vallist) \
argmatch (Arg, Arglist, (const char *) Vallist, sizeof (*Vallist))
argmatch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
# define ARGCASEMATCH(Arg, Arglist, Vallist) \
argcasematch (Arg, Arglist, (const char *) Vallist, sizeof (*Vallist))
argcasematch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
@@ -63,7 +63,7 @@ void argmatch_invalid
/* Left for compatibility with the old name invalid_arg */
# define invalid_arg(Kind, Value, Problem) \
argmatch_invalid (Kind, Value, Problem)
argmatch_invalid ((Kind), (Value), (Problem))
@@ -74,36 +74,38 @@ void argmatch_valid
const char *vallist, size_t valsize));
# define ARGMATCH_VALID(Arglist, Vallist) \
valid_args (Arglist, (const char *) Vallist, sizeof (*Vallist))
argmatch_valid (Arglist, (const char *) Vallist, sizeof (*Vallist))
/* Returns matches, or, upon error, report explanatory message and
exit. */
int __xargmatch_internal
PARAMS ((const char *kind,
const char *arg, const char *const *arglist,
const char *vallist, size_t valsize,
int sensitive));
# define XARGMATCH(Kind, Arg, Arglist, Vallist) \
Vallist [__xargmatch_internal (Kind, Arg, Arglist, \
(const char *) Vallist, sizeof (*Vallist), 1)]
# define XARGCASEMATCH(Kind, Arg, Arglist, Vallist) \
Vallist [__xargmatch_internal (Kind, Arg, Arglist, \
(const char *) Vallist, sizeof (*Vallist), 0)]
/* Set *Result_ptr to the value in Vallist corresponding to the Arg
in Arglist. If Arg doesn't match any string in Arglist, give a
diagnostic and (presumably) exit via the Die_stmt, leaving *Result_ptr
unmodified. */
# define XARGMATCH(Result_ptr, Kind, Arg, Arglist, Vallist, Die_stmt) \
do \
{ \
int _i = ARGMATCH (Arg, Arglist, Vallist); \
if (_i >= 0) \
*(Result_ptr) = (Vallist) [_i]; \
else \
{ \
argmatch_invalid ((Kind), (Arg), _i); \
ARGMATCH_VALID (Arglist, Vallist); \
Die_stmt; \
} \
} \
while (0)
/* Convert a value into a corresponding argument. */
const char *argmatch_to_argument
PARAMS ((char *value, const char *const *arglist,
PARAMS ((char const *value, const char *const *arglist,
const char *vallist, size_t valsize));
# define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist) \
argmatch_to_argument ((char *) &Value, Arglist, \
(const char *) Vallist, sizeof (*Vallist))
# define ARGMATCH_TO_ARGUMENT(Value, Arglist, Vallist) \
argmatch_to_argument ((char const *) &(Value), (Arglist), \
(const char *) (Vallist), sizeof (*(Vallist)))
#endif /* ARGMATCH_H_ */