mirrors/passt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

conf: Remove unhelpful usage() wrapper

Browse source 
usage() does nothing but call print_usage() with EXIT_FAILURE as a
parameter.  It's no more complex to just give that parameter at the single
call site.  Eliminate it and rename print_usage() to just usage().

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Signed-off-by: Stefano Brivio <sbrivio@redhat.com>
This commit is contained in:
David Gibson 2024-06-05 10:42:40 +10:00 committed by Stefano Brivio
parent e84a01e94c
commit e651197b5c
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
conf.c
View file

@ -704,11 +704,11 @@ static unsigned int conf_ip6(unsigned int ifi,
} }
/** /**
* print_usage() - Print usage, exit with given status code * usage() - Print usage, exit with given status code
* @name: Executable name * @name: Executable name
* @status: Status code for exit() * @status: Status code for exit()
*/ */
static void print_usage(const char *name, int status) static void usage(const char *name, int status)
{ {
if (strstr(name, "pasta")) { if (strstr(name, "pasta")) {
info("Usage: %s [OPTION]... [COMMAND] [ARGS]...", name); info("Usage: %s [OPTION]... [COMMAND] [ARGS]...", name);
@ -897,15 +897,6 @@ pasta_opts:
exit(status); exit(status);
} }
/**
* usage() - Print usage and exit with failure
* @name: Executable name
*/
static void usage(const char *name)
{
print_usage(name, EXIT_FAILURE);
}
/** /**
* conf_print() - Print fundamental configuration parameters * conf_print() - Print fundamental configuration parameters
* @c: Execution context * @c: Execution context
@ -1647,11 +1638,11 @@ void conf(struct ctx *c, int argc, char **argv)
break; break;
case 'h': case 'h':
log_to_stdout = 1; log_to_stdout = 1;
print_usage(argv[0], EXIT_SUCCESS); usage(argv[0], EXIT_SUCCESS);
break; break;
case '?': case '?':
default: default:
usage(argv[0]); usage(argv[0], EXIT_FAILURE);
break; break;
} }
} while (name != -1); } while (name != -1);