From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id 40DA1384A01D for ; Wed, 17 Mar 2021 13:14:48 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 40DA1384A01D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 59292AC24; Wed, 17 Mar 2021 13:14:47 +0000 (UTC) Date: Wed, 17 Mar 2021 14:14:45 +0100 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com, mark@klomp.org Subject: [committed] Make main more readable Message-ID: <20210317131444.GA11885@delia> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: dwz@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Dwz mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Mar 2021 13:14:49 -0000 Hi, Use variables nr_files and files in main instead of optind, where possible. Committed to trunk. Thanks, - Tom Make main more readable 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");