From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22983 invoked by alias); 24 Nov 2013 02:12:18 -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 22642 invoked by uid 89); 24 Nov 2013 02:12:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-0.1 required=5.0 tests=AWL,BAYES_50,RDNS_NONE,URIBL_BLOCKED autolearn=no version=3.3.2 X-HELO: relay1.mentorg.com Received: from Unknown (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 24 Nov 2013 02:12:10 +0000 Received: from svr-orw-fem-01.mgc.mentorg.com ([147.34.98.93]) by relay1.mentorg.com with esmtp id 1VkPAt-0006qH-7w from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Sat, 23 Nov 2013 18:11:51 -0800 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by svr-orw-fem-01.mgc.mentorg.com over TLS secured channel with Microsoft SMTPSVC(6.0.3790.4675); Sat, 23 Nov 2013 18:11:51 -0800 Received: from qiyao.dyndns.org (147.34.91.1) by svr-orw-fem-02.mgc.mentorg.com (147.34.96.168) with Microsoft SMTP Server id 14.2.247.3; Sat, 23 Nov 2013 18:11:49 -0800 From: Yao Qi To: Subject: [PATCH 04/11] Remove #if HAVE_PYTHON Date: Sun, 24 Nov 2013 02:12:00 -0000 Message-ID: <1385258996-26047-5-git-send-email-yao@codesourcery.com> In-Reply-To: <1385258996-26047-1-git-send-email-yao@codesourcery.com> References: <1385258996-26047-1-git-send-email-yao@codesourcery.com> MIME-Version: 1.0 Content-Type: text/plain X-IsSubscribed: yes X-SW-Source: 2013-11/txt/msg00739.txt.bz2 This patch removes some unnecessary "#if HAVE_PYTHON" so that more code is generalized. gdb: 2013-11-24 Pedro Alves Yao Qi * varobj.c: Remove "#if HAVE_PYTHON" and "#endif". (varobj_get_iterator): Wrap up code for pretty-printer by "#if HAVE_PYTHON" and "#endif". (update_dynamic_varobj_children): Likewise. --- gdb/varobj.c | 20 +++++--------------- 1 files changed, 5 insertions(+), 15 deletions(-) diff --git a/gdb/varobj.c b/gdb/varobj.c index 28e934c..e362229 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -212,13 +212,9 @@ static char *my_value_of_variable (struct varobj *var, static int is_root_p (struct varobj *var); -#if HAVE_PYTHON - static struct varobj *varobj_add_child (struct varobj *var, struct varobj_item *item); -#endif /* HAVE_PYTHON */ - /* Private data */ /* Mappings of varobj_display_formats enums to gdb's format codes. */ @@ -701,8 +697,6 @@ varobj_restrict_range (VEC (varobj_p) *children, int *from, int *to) } } -#if HAVE_PYTHON - /* A helper for update_dynamic_varobj_children that installs a new child when needed. */ @@ -747,6 +741,8 @@ install_dynamic_child (struct varobj *var, } } +#if HAVE_PYTHON + static int dynamic_varobj_has_child_method (struct varobj *var) { @@ -762,6 +758,7 @@ dynamic_varobj_has_child_method (struct varobj *var) do_cleanups (back_to); return result; } +#endif /* Dynamic varobj's iterator factory. Returns an iterator object suitable for iterating over VAR's children. */ @@ -769,8 +766,10 @@ dynamic_varobj_has_child_method (struct varobj *var) static struct varobj_iter * varobj_get_iterator (struct varobj *var) { +#if HAVE_PYTHON if (var->dynamic->pretty_printer) return py_varobj_get_iterator (var, var->dynamic->pretty_printer); +#endif gdb_assert_not_reached (_("\ requested an interator from a non-dynamic varobj")); @@ -788,7 +787,6 @@ varobj_clear_saved_item (struct varobj_dynamic *var) var->saved_item = NULL; } } -#endif static int update_dynamic_varobj_children (struct varobj *var, @@ -801,7 +799,6 @@ update_dynamic_varobj_children (struct varobj *var, int from, int to) { -#if HAVE_PYTHON int i; *cchanged = 0; @@ -891,9 +888,6 @@ update_dynamic_varobj_children (struct varobj *var, var->num_children = VEC_length (varobj_p, var->children); return 1; -#else - gdb_assert_not_reached ("should never be called if Python is not enabled"); -#endif } int @@ -970,8 +964,6 @@ varobj_list_children (struct varobj *var, int *from, int *to) return var->children; } -#if HAVE_PYTHON - static struct varobj * varobj_add_child (struct varobj *var, struct varobj_item *item) { @@ -983,8 +975,6 @@ varobj_add_child (struct varobj *var, struct varobj_item *item) return v; } -#endif /* HAVE_PYTHON */ - /* Obtain the type of an object Variable as a string similar to the one gdb prints on the console. */ -- 1.7.7.6