(read_utmp): Use the new definitions.

[gnulib.git] / lib / argmatch.h

diff --git a/lib/argmatch.h b/lib/argmatch.h
index 9772dcc..d3f25cc 100644 (file)
--- a/lib/argmatch.h
+++ b/lib/argmatch.h
@@ -35,6 +35,17 @@
 #  endif  /* GCC.  */
 # endif  /* Not PARAMS.  */
 
+/* Assert there are as many real arguments as there are values
+   (argument list ends with a NULL guard).  There is no execution
+   cost, since it will be statically evalauted to `assert (0)' or
+   `assert (1)'.  Unfortunately there is no -Wassert-0. */
+
+# undef ARRAY_CARDINALITY
+# define ARRAY_CARDINALITY(Array) (sizeof ((Array)) / sizeof (*(Array)))
+
+# define ARGMATCH_ASSERT(Arglist, Vallist)      \
+  assert (ARRAY_CARDINALITY ((Arglist)) == ARRAY_CARDINALITY ((Vallist)) + 1)
+
 /* Return the index of the element of ARGLIST (NULL terminated) that
    matches with ARG.  If VALLIST is not NULL, then use it to resolve
    false ambiguities (i.e., different matches of ARG but corresponding
@@ -53,17 +64,21 @@ int argcasematch
 # define ARGCASEMATCH(Arg, Arglist, Vallist) \
   argcasematch ((Arg), (Arglist), (const char *) (Vallist), sizeof (*(Vallist)))
 
-
+/* xargmatch calls this function when it fails.  This function should not
+   return.  By default, this is a function that calls ARGMATCH_DIE which
+   in turn defaults to `exit (EXIT_FAILURE)'.  */
+typedef void (*argmatch_exit_fn) PARAMS ((void));
+extern argmatch_exit_fn argmatch_die;
 
 /* Report on stderr why argmatch failed.  Report correct values. */
 
 void argmatch_invalid
-  PARAMS ((const char *kind, const char *value, int problem));
+  PARAMS ((const char *context, const char *value, int problem));
 
 /* Left for compatibility with the old name invalid_arg */
 
-# define invalid_arg(Kind, Value, Problem) \
-  argmatch_invalid ((Kind), (Value), (Problem))
+# define invalid_arg(Context, Value, Problem) \
+  argmatch_invalid ((Context), (Value), (Problem))
 
 
 
@@ -74,29 +89,32 @@ void argmatch_valid
           const char *vallist, size_t valsize));
 
 # define ARGMATCH_VALID(Arglist, Vallist) \
-  argmatch_valid (Arglist, (const char *) Vallist, sizeof (*Vallist))
-
-
-/* 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)
+  argmatch_valid (Arglist, (const char *) Vallist, sizeof (*(Vallist)))
+
+
+
+/* Same as argmatch, but upon failure, reports a explanation on the
+   failure, and exits using the function EXIT_FN. */
+
+int __xargmatch_internal
+  PARAMS ((const char *context,
+          const char *arg, const char *const *arglist,
+          const char *vallist, size_t valsize,
+          int case_sensitive, argmatch_exit_fn exit_fn));
+
+/* Programmer friendly interface to __xargmatch_internal. */
+
+# define XARGMATCH(Context, Arg, Arglist, Vallist)                     \
+  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist), \
+                                  (const char *) (Vallist),    \
+                                 sizeof (*(Vallist)),          \
+                                 1, argmatch_die)])
 
+# define XARGCASEMATCH(Context, Arg, Arglist, Vallist)         \
+  (Vallist [__xargmatch_internal ((Context), (Arg), (Arglist), \
+                                  (const char *) (Vallist),    \
+                                 sizeof (*(Vallist)),          \
+                                 0, argmatch_die)])
 
 /* Convert a value into a corresponding argument. */