From 4153e409bf41f75399e76fe8816862cf3f265f38 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 17 Mar 2021 14:14:00 +0100 Subject: [PATCH] Make main more readable Use variables nr_files and files in main instead of optind, where possible. 2021-03-17 Tom de Vries * dwz.c (main): Use nr_files and files instead of optind. --- dwz.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dwz.c b/dwz.c index 8f64a34..c5a27be 100644 --- a/dwz.c +++ b/dwz.c @@ -17041,6 +17041,8 @@ main (int argc, char *argv[]) int ret; const char *outfile; bool hardlink; + int nr_files; + const char **files; if (elf_version (EV_CURRENT) == EV_NONE) error (1, 0, "library out of date"); @@ -17048,10 +17050,12 @@ main (int argc, char *argv[]) outfile = NULL; hardlink = false; parse_args (argc, argv, &hardlink, &outfile); + nr_files = argc - optind; + files = (const char **)&argv[optind]; - if (optind == argc || optind + 1 == argc) + if (nr_files <= 1) { - const char *file = optind == argc ? "a.out" : argv[optind]; + const char *file = nr_files == 0 ? "a.out" : files[0]; if (multifile != NULL) { @@ -17063,9 +17067,6 @@ main (int argc, char *argv[]) } else { - int nr_files = argc - optind; - const char **files = (const char **)&argv[optind]; - if (outfile != NULL) error (1, 0, "-o option not allowed for multiple files"); -- 2.43.5