From 8c5c4e1b930d07e87e23894e9d50f3d1c00a70b7 Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Tue, 3 Mar 2026 23:27:59 +0000 Subject: util/nvmutil: reset global state in one function split it out of main. this is good hygiene and it's preparation for a planned expansion in the future, that allows operation on multiple files. Signed-off-by: Leah Rowe --- util/nvmutil/nvmutil.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) (limited to 'util/nvmutil') diff --git a/util/nvmutil/nvmutil.c b/util/nvmutil/nvmutil.c index c1882af2..62821278 100644 --- a/util/nvmutil/nvmutil.c +++ b/util/nvmutil/nvmutil.c @@ -13,6 +13,7 @@ #include #include +static void reset_global_state(int, char **); static void set_cmd(int, char **); static void check_cmd_args(int, char **); static void set_io_flags(int, char **); @@ -99,17 +100,9 @@ int main(int argc, char *argv[]) { argv0 = argv[0]; - - mac = NULL; - invert = 0; - part_modified[0] = 0; - part_modified[1] = 0; - fname = ""; - cmd = NULL; - if (argc < 2) usage(); - fname = argv[1]; + reset_global_state(argc, argv); #ifdef __OpenBSD__ err_if(pledge("stdio rpath wpath unveil", NULL) == -1); err_if(unveil("/dev/urandom", "r") == -1); @@ -145,6 +138,19 @@ main(int argc, char *argv[]) return errno ? EXIT_FAILURE : EXIT_SUCCESS; } +static void +reset_global_state(int argc, char *argv[]) +{ + mac = NULL; + invert = 0; + part_modified[0] = 0; + part_modified[1] = 0; + fname = ""; + cmd = NULL; + + fname = argv[1]; +} + static void set_cmd(int argc, char *argv[]) { -- cgit v1.2.1