From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 30197 invoked by alias); 27 Jun 2019 16:14:02 -0000 Mailing-List: contact dwz-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Post: List-Help: List-Subscribe: Sender: dwz-owner@sourceware.org Received: (qmail 30178 invoked by uid 89); 27 Jun 2019 16:14:01 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Checked: by ClamAV 0.100.3 on sourceware.org X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 spammy= X-Spam-Status: No, score=-24.6 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,SPF_PASS autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on sourceware.org X-Spam-Level: X-HELO: mx1.suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Date: Tue, 01 Jan 2019 00:00:00 -0000 From: Tom de Vries To: dwz@sourceware.org, jakub@redhat.com Subject: [committed][NFC] Put for body between braces in write_dso Message-ID: <20190627161355.GA8914@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-SW-Source: 2019-q2/txt/msg00083.txt.bz2 Hi, This cosmetic change makes the following patch more minimal. Committed to trunk. Thanks, - Tom [NFC] Put for body between braces in write_dso 2019-06-27 Tom de Vries * dwz.c (write_dso): Put for body between braces. --- dwz.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/dwz.c b/dwz.c index 4e14086..dd6da31 100644 --- a/dwz.c +++ b/dwz.c @@ -10670,24 +10670,26 @@ write_dso (DSO *dso, const char *file, struct stat *st) int l; for (l = 1, j = sorted_section_numbers[l]; l <= dso->ehdr.e_shnum; ++l, j = sorted_section_numbers[l]) - if (j == dso->ehdr.e_shnum) - continue; - else if (dso->shdr[j].sh_offset < min_shoff && !last_shoff) - continue; - else if ((dso->shdr[j].sh_flags & SHF_ALLOC) != 0) - { - error (0, 0, "Allocatable section in %s after non-allocatable " - "ones", dso->filename); - return 1; - } - else - { - assert (dso->shdr[j].sh_offset >= last_shoff); + { + if (j == dso->ehdr.e_shnum) + continue; + else if (dso->shdr[j].sh_offset < min_shoff && !last_shoff) + continue; + else if ((dso->shdr[j].sh_flags & SHF_ALLOC) != 0) + { + error (0, 0, "Allocatable section in %s after " + "non-allocatable ones", dso->filename); + return 1; + } + else + { + assert (dso->shdr[j].sh_offset >= last_shoff); - if (k == -1) - k = l; - last_shoff = dso->shdr[j].sh_offset + dso->shdr[j].sh_size; - } + if (k == -1) + k = l; + last_shoff = dso->shdr[j].sh_offset + dso->shdr[j].sh_size; + } + } last_shoff = min_shoff; for (l = k, j = sorted_section_numbers[l]; l <= dso->ehdr.e_shnum; ++l, j = sorted_section_numbers[l])