From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24840 invoked by alias); 29 Mar 2013 19:53:49 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 24151 invoked by uid 89); 29 Mar 2013 19:53:09 -0000 X-Spam-SWARE-Status: No, score=-6.9 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS,TW_XS autolearn=ham version=3.3.1 Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Fri, 29 Mar 2013 19:53:06 +0000 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r2TJr5h6007581 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Fri, 29 Mar 2013 15:53:05 -0400 Received: from host2.jankratochvil.net (ovpn-116-39.ams2.redhat.com [10.36.116.39]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r2TJr1lV013942 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NO) for ; Fri, 29 Mar 2013 15:53:04 -0400 Date: Sun, 31 Mar 2013 17:43:00 -0000 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [patch 1/2+7.6] /proc/PID/smaps: filename fix Message-ID: <20130329195301.GA3502@host2.jankratochvil.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-IsSubscribed: yes X-SW-Source: 2013-03/txt/msg01129.txt.bz2 Hi, currently GDB complains: warning: Error parsing {s,}maps file '[heap]' warning: Error parsing {s,}maps file '/usr/lib64/libc-2.17.so' which is sure incorrect, it should have been: warning: Error parsing {s,}maps file '/proc/30100/smaps' warning: Error parsing {s,}maps file '/proc/30100/smaps' (That the error happens at all is off-topic for this mail.) While it is 'obvious' GDB CVS inaccessible to me now so neither regression tested nor checked in yet. Thanks, Jan gdb/ 2013-03-29 Jan Kratochvil Fix variable name shadowing. * linux-tdep.c (linux_find_memory_regions_full): Rename outer variable filename to mapsfilename and update its uses. diff --git a/gdb/linux-tdep.c b/gdb/linux-tdep.c index a132fc6..cc63e9b 100644 --- a/gdb/linux-tdep.c +++ b/gdb/linux-tdep.c @@ -675,22 +675,22 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch, linux_find_memory_region_ftype *func, void *obfd) { - char filename[100]; + char mapsfilename[100]; gdb_byte *data; /* We need to know the real target PID to access /proc. */ if (current_inferior ()->fake_pid_p) return 1; - xsnprintf (filename, sizeof filename, + xsnprintf (mapsfilename, sizeof mapsfilename, "/proc/%d/smaps", current_inferior ()->pid); - data = target_fileio_read_stralloc (filename); + data = target_fileio_read_stralloc (mapsfilename); if (data == NULL) { /* Older Linux kernels did not support /proc/PID/smaps. */ - xsnprintf (filename, sizeof filename, + xsnprintf (mapsfilename, sizeof mapsfilename, "/proc/%d/maps", current_inferior ()->pid); - data = target_fileio_read_stralloc (filename); + data = target_fileio_read_stralloc (mapsfilename); } if (data) { @@ -724,7 +724,7 @@ linux_find_memory_regions_full (struct gdbarch *gdbarch, if (sscanf (line, "%64s%lu kB\n", keyword, &number) != 2) { - warning (_("Error parsing {s,}maps file '%s'"), filename); + warning (_("Error parsing {s,}maps file '%s'"), mapsfilename); break; } if (strcmp (keyword, "Anonymous:") == 0)