From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 17733 invoked by alias); 9 Oct 2013 17:53:29 -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 17724 invoked by uid 89); 9 Oct 2013 17:53:28 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.7 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Oct 2013 17:53:23 +0000 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r99HHwMP005651 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Wed, 9 Oct 2013 13:17:58 -0400 Received: from redhat.brq.redhat.com (unused-4-133.brq.redhat.com [10.34.4.133]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id r99HHgcE010424; Wed, 9 Oct 2013 13:17:57 -0400 From: Ondrej Oprala To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 08/18] poison "mutable" Date: Wed, 09 Oct 2013 17:53:00 -0000 Message-Id: <1381339053-14519-9-git-send-email-ooprala@redhat.com> In-Reply-To: <1381339053-14519-1-git-send-email-ooprala@redhat.com> References: <1381339053-14519-1-git-send-email-ooprala@redhat.com> X-IsSubscribed: yes X-SW-Source: 2013-10/txt/msg00312.txt.bz2 From: Tom Tromey --- gdb/ChangeLog | 4 ++++ gdb/addrmap.c | 12 ++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index d1909bb..53446c9 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -17,6 +17,10 @@ 2013-10-09 Tom Tromey + * addrmap.c (mutable_map) : Rename from mutable. + +2013-10-09 Tom Tromey + * mi/mi-cmd-var.c (is_explicit) : Rename from explicit. * varobj.c (is_explicit) : Likewise. * varobj.h (is_explicit) : Likewise. diff --git a/gdb/addrmap.c b/gdb/addrmap.c index 348fd43..ccd125c 100644 --- a/gdb/addrmap.c +++ b/gdb/addrmap.c @@ -429,16 +429,16 @@ splay_foreach_copy (splay_tree_node n, void *closure) static struct addrmap * addrmap_mutable_create_fixed (struct addrmap *self, struct obstack *obstack) { - struct addrmap_mutable *mutable = (struct addrmap_mutable *) self; + struct addrmap_mutable *mutable_map = (struct addrmap_mutable *) self; struct addrmap_fixed *fixed; size_t num_transitions; /* Count the number of transitions in the tree. */ num_transitions = 0; - splay_tree_foreach (mutable->tree, splay_foreach_count, &num_transitions); + splay_tree_foreach (mutable_map->tree, splay_foreach_count, &num_transitions); /* Include an extra entry for the transition at zero (which fixed - maps have, but mutable maps do not.) */ + maps have, but mutable_map maps do not.) */ num_transitions++; fixed = obstack_alloc (obstack, @@ -452,7 +452,7 @@ addrmap_mutable_create_fixed (struct addrmap *self, struct obstack *obstack) /* Copy all entries from the splay tree to the array, in order of increasing address. */ - splay_tree_foreach (mutable->tree, splay_foreach_copy, fixed); + splay_tree_foreach (mutable_map->tree, splay_foreach_copy, fixed); /* We should have filled the array. */ gdb_assert (fixed->num_transitions == num_transitions); @@ -496,12 +496,12 @@ static int addrmap_mutable_foreach (struct addrmap *self, addrmap_foreach_fn fn, void *data) { - struct addrmap_mutable *mutable = (struct addrmap_mutable *) self; + struct addrmap_mutable *mutable_map = (struct addrmap_mutable *) self; struct mutable_foreach_data foreach_data; foreach_data.fn = fn; foreach_data.data = data; - return splay_tree_foreach (mutable->tree, addrmap_mutable_foreach_worker, + return splay_tree_foreach (mutable_map->tree, addrmap_mutable_foreach_worker, &foreach_data); } -- 1.8.3.1