lagertonne/ifupdown-ng
1
0
Fork 0
Code Issues Pull requests Projects Releases 4 Wiki Activity

ifquery: use generic_usage() instead of ifquery_usage()

Browse source
This commit is contained in:
Ariadne Conill 2020-08-11 23:10:35 -06:00
parent f6d9f65248
commit fda7bfae57
5 changed files with 10 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
cmd/ifquery.c
View file

@ -158,15 +158,6 @@ print_interface_property(struct lif_interface *iface, const char *property)
}
}
void
ifquery_usage(int status)
{
fprintf(stderr, "usage: ifquery [options] <interfaces>\n");
fprintf(stderr, " ifquery [options] --list\n");
exit(status);
}
void
list_interfaces(struct lif_dict *collection, struct match_options *opts)
{
@ -289,7 +280,7 @@ ifquery_main(int argc, char *argv[])
/* --list --state is not allowed */
if (listing && listing_stat)
ifquery_usage(EXIT_FAILURE);
generic_usage(self_applet, EXIT_FAILURE);
if (listing)
{
@ -303,7 +294,7 @@ ifquery_main(int argc, char *argv[])
}
if (optind >= argc)
ifquery_usage(EXIT_FAILURE);
generic_usage(self_applet, EXIT_FAILURE);
int idx = optind;
for (; idx < argc; idx++)
@ -337,6 +328,6 @@ struct if_applet ifquery_applet = {
.name = "ifquery",
.desc = "query interface configuration",
.main = ifquery_main,
.usage = ifquery_usage,
.usage = "ifquery [options] <interfaces>\n ifquery [options] --list",
.groups = { &global_option_group, &match_option_group, &exec_option_group, &local_option_group },
};