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 5D780385800F for ; Sat, 27 Mar 2021 12:57:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5D780385800F 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 7F886AD4A; Sat, 27 Mar 2021 12:57:30 +0000 (UTC) Date: Sat, 27 Mar 2021 13:57:28 +0100 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com, mark@klomp.org Subject: [committed] Use goto in dwz_files_1 Message-ID: <20210327125727.GA18369@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.0 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_NUMSUBJECT, 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: Sat, 27 Mar 2021 12:57:32 -0000 Hi, Use goto in dwz_files_1 to remove indentation, replacing: ... if (...) ret = 1; else { /* Lots of code. */ } /* Cleanup. */ ... with: ... if (...) { ret = 1; goto cleanup; } /* Lots of code. */ cleanup: /* Cleanup. */ ... Committed to trunk. Thanks, - Tom Use goto in dwz_files_1 2021-03-27 Tom de Vries * dwz.c (dwz_files_1): Reduce indentation. --- dwz.c | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/dwz.c b/dwz.c index f20a47d..3cc0a26 100644 --- a/dwz.c +++ b/dwz.c @@ -16603,32 +16603,36 @@ dwz_files_1 (int nr_files, char *files[], bool hardlink, dso = read_multifile (multi_fd, multifile_die_count); if (dso == NULL) - ret = 1; - else { - for (i = 0; i < nr_files; i++) - { - dw_cu_ref cu; - file = files[i]; - if (stats_p) - init_stats (file); - multifile_mode = MULTIFILE_MODE_FI; - /* Don't process again files that couldn't - be processed successfully. Also skip hard links. */ - if (resa[i].res == -1 || resa[i].res == -2 - || resa[i].skip_multifile) - continue; - for (cu = alt_first_cu; cu; cu = cu->cu_next) - alt_clear_dups (cu->cu_die); - ret |= dwz (file, NULL, &resa[i]); - } - if (hardlink) - update_hardlinks (nr_files, files, resa); - elf_end (dso->elf); - close (multi_fd); - free (dso); + ret = 1; + goto cleanup; } + for (i = 0; i < nr_files; i++) + { + dw_cu_ref cu; + file = files[i]; + if (stats_p) + init_stats (file); + multifile_mode = MULTIFILE_MODE_FI; + /* Don't process again files that couldn't + be processed successfully. Also skip hard links. */ + if (resa[i].res == -1 || resa[i].res == -2 + || resa[i].skip_multifile) + continue; + for (cu = alt_first_cu; cu; cu = cu->cu_next) + alt_clear_dups (cu->cu_die); + ret |= dwz (file, NULL, &resa[i]); + } + + if (hardlink) + update_hardlinks (nr_files, files, resa); + + elf_end (dso->elf); + close (multi_fd); + free (dso); + + cleanup: cleanup (); strp_htab = alt_strp_htab;