From 3af94efc16562dc1f2e359064f6cb1eb60f45c80 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 3 Mar 2026 18:03:27 +0000 Subject: util/nvmutil: more consistent output in usage() and use getnvmprogname Signed-off-by: Leah Rowe --- util/nvmutil/nvmutil.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'util/nvmutil') diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index ea8aab61..07f3dc03 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -43,7 +43,7 @@ static void check_bound(int, int); static void write_gbe(void); static void write_gbe_part(int); static void swap(int); -static void usage(const char *); +static void usage(void); static void err_if(int); static void err(int, const char *, ...); static const char *getnvmprogname(void); @@ -97,7 +97,7 @@ main(int argc, char *argv[]) { argv0 = argv[0]; if (argc < 2) - usage(getnvmprogname()); + usage(); fname = argv[1]; #ifdef __OpenBSD__ err_if(pledge("stdio rpath wpath unveil", NULL) == -1); @@ -572,21 +572,22 @@ swap(int partnum) } static void -usage(const char *util) +usage(void) { + const char *util = getnvmprogname(); #ifdef __OpenBSD__ err_if(pledge("stdio", NULL) == -1); #endif fprintf(stderr, "Modify Intel GbE NVM images e.g. set MAC\n" "USAGE:\n" - "%s FILE dump\n" - " %s FILE\n # same as setmac without arg\n" - " %s FILE setmac [MAC]\n" - " %s FILE swap\n" - " %s FILE copy 0|1\n" - " %s FILE brick 0|1\n" - " %s FILE setchecksum 0|1\n", + "\t%s FILE dump\n" + "\t%s FILE # same as setmac without [MAC]\n" + "\t%s FILE setmac [MAC]\n" + "\t%s FILE swap\n" + "\t%s FILE copy 0|1\n" + "\t%s FILE brick 0|1\n" + "\t%s FILE setchecksum 0|1\n", util, util, util, util, util, util, util); err(set_err(ECANCELED), "Too few arguments"); } -- cgit v1.2.1