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(a)gibson.dropbear.id.au>
---
conf.c | 17 ++++-------------
1 file changed, 4 insertions(+), 13 deletions(-)
diff --git a/conf.c b/conf.c
index 50383a39..f2a92574 100644
--- a/conf.c
+++ b/conf.c
@@ -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
* @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")) {
info("Usage: %s [OPTION]... [COMMAND] [ARGS]...", name);
@@ -897,15 +897,6 @@ pasta_opts:
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
* @c: Execution context
@@ -1647,11 +1638,11 @@ void conf(struct ctx *c, int argc, char **argv)
break;
case 'h':
log_to_stdout = 1;
- print_usage(argv[0], EXIT_SUCCESS);
+ usage(argv[0], EXIT_SUCCESS);
break;
case '?':
default:
- usage(argv[0]);
+ usage(argv[0], EXIT_FAILURE);
break;
}
} while (name != -1);
--
2.45.1