Commit ae6d8f57 authored by Dridi Boukelmoune's avatar Dridi Boukelmoune

Remove the VUT_g_Arg special case

It's no longer used anyway, and was already called via the generic
VUT_Arg function.
parent 063be1b6
...@@ -69,8 +69,6 @@ extern struct VUT VUT; ...@@ -69,8 +69,6 @@ extern struct VUT VUT;
void VUT_Error(int status, const char *fmt, ...) void VUT_Error(int status, const char *fmt, ...)
__v_printflike(2, 3) __attribute__((__noreturn__)); __v_printflike(2, 3) __attribute__((__noreturn__));
int VUT_g_Arg(const char *arg);
int VUT_Arg(int opt, const char *arg); int VUT_Arg(int opt, const char *arg);
void VUT_Init(const char *progname, int argc, char * const *argv, void VUT_Init(const char *progname, int argc, char * const *argv,
......
...@@ -133,7 +133,6 @@ LIBVARNISHAPI_2.0 { ...@@ -133,7 +133,6 @@ LIBVARNISHAPI_2.0 {
VUT_Init; VUT_Init;
VUT_Main; VUT_Main;
VUT_Setup; VUT_Setup;
VUT_g_Arg;
local: local:
*; *;
......
...@@ -124,18 +124,6 @@ VUT_Error(int status, const char *fmt, ...) ...@@ -124,18 +124,6 @@ VUT_Error(int status, const char *fmt, ...)
exit(status); exit(status);
} }
int
VUT_g_Arg(const char *arg)
{
VUT.g_arg = VSLQ_Name2Grouping(arg, -1);
if (VUT.g_arg == -2)
VUT_Error(1, "Ambiguous grouping type: %s", arg);
else if (VUT.g_arg < 0)
VUT_Error(1, "Unknown grouping type: %s", arg);
return (1);
}
int int
VUT_Arg(int opt, const char *arg) VUT_Arg(int opt, const char *arg)
{ {
...@@ -154,7 +142,12 @@ VUT_Arg(int opt, const char *arg) ...@@ -154,7 +142,12 @@ VUT_Arg(int opt, const char *arg)
case 'g': case 'g':
/* Grouping */ /* Grouping */
AN(arg); AN(arg);
return (VUT_g_Arg(arg)); VUT.g_arg = VSLQ_Name2Grouping(arg, -1);
if (VUT.g_arg == -2)
VUT_Error(1, "Ambiguous grouping type: %s", arg);
else if (VUT.g_arg < 0)
VUT_Error(1, "Unknown grouping type: %s", arg);
return (1);
case 'k': case 'k':
/* Log transaction limit */ /* Log transaction limit */
AN(arg); AN(arg);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment