From patchwork Fri Aug 1 22:09:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Marchi X-Patchwork-Id: 2289 Received: (qmail 8458 invoked by alias); 1 Aug 2014 22:09:30 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8408 invoked by uid 89); 1 Aug 2014 22:09:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.2 required=5.0 tests=AWL, BAYES_05, SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Fri, 01 Aug 2014 22:09:17 +0000 Received: from EUSAAHC004.ericsson.se (Unknown_Domain [147.117.188.84]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 6A.D1.05330.89CBBD35; Fri, 1 Aug 2014 18:13:12 +0200 (CEST) Received: from simark-hp.mo.ca.am.ericsson.se (147.117.188.8) by smtps-am.internal.ericsson.com (147.117.188.84) with Microsoft SMTP Server (TLS) id 14.3.174.1; Fri, 1 Aug 2014 18:09:13 -0400 From: Simon Marchi To: CC: Simon Marchi Subject: [PATCH] Rename variable with confusing name Date: Fri, 1 Aug 2014 18:09:06 -0400 Message-ID: <1406930946-28195-1-git-send-email-simon.marchi@ericsson.com> MIME-Version: 1.0 X-IsSubscribed: yes I saw this gem of not so legible code in solib-svr4.c (scan_dyntag): if (dyn_tag == dyntag) and thought it deserved a small rename. This just renames variables to be a bit more clear for those who read the code. dyn_ptr was renamed as well to keep consistency. I also constified the parameter because, why not. Tested only by rebuilding, since the change was done mechanically. gdb/Changelog: 2014-08-01 Simon Marchi * solib-svr4.c (scan_dyntag): Rename dyntag, dyn_tag and dyn_ptr variables. --- gdb/solib-svr4.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gdb/solib-svr4.c b/gdb/solib-svr4.c index af9d648..d1a6aea 100644 --- a/gdb/solib-svr4.c +++ b/gdb/solib-svr4.c @@ -614,14 +614,14 @@ find_program_interpreter (void) } -/* Scan for DYNTAG in .dynamic section of ABFD. If DYNTAG is found 1 is - returned and the corresponding PTR is set. */ +/* Scan for DESIRED_DYNTAG in .dynamic section of ABFD. If DESIRED_DYNTAG is + found, 1 is returned and the corresponding PTR is set. */ static int -scan_dyntag (int dyntag, bfd *abfd, CORE_ADDR *ptr) +scan_dyntag (const int desired_dyntag, bfd *abfd, CORE_ADDR *ptr) { int arch_size, step, sect_size; - long dyn_tag; + long current_dyntag; CORE_ADDR dyn_ptr, dyn_addr; gdb_byte *bufend, *bufstart, *buf; Elf32_External_Dyn *x_dynp_32; @@ -679,18 +679,18 @@ scan_dyntag (int dyntag, bfd *abfd, CORE_ADDR *ptr) if (arch_size == 32) { x_dynp_32 = (Elf32_External_Dyn *) buf; - dyn_tag = bfd_h_get_32 (abfd, (bfd_byte *) x_dynp_32->d_tag); + current_dyntag = bfd_h_get_32 (abfd, (bfd_byte *) x_dynp_32->d_tag); dyn_ptr = bfd_h_get_32 (abfd, (bfd_byte *) x_dynp_32->d_un.d_ptr); } else { x_dynp_64 = (Elf64_External_Dyn *) buf; - dyn_tag = bfd_h_get_64 (abfd, (bfd_byte *) x_dynp_64->d_tag); + current_dyntag = bfd_h_get_64 (abfd, (bfd_byte *) x_dynp_64->d_tag); dyn_ptr = bfd_h_get_64 (abfd, (bfd_byte *) x_dynp_64->d_un.d_ptr); } - if (dyn_tag == DT_NULL) + if (current_dyntag == DT_NULL) return 0; - if (dyn_tag == dyntag) + if (current_dyntag == desired_dyntag) { /* If requested, try to read the runtime value of this .dynamic entry. */