From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 22754 invoked by alias); 24 Nov 2013 02:12:14 -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 22539 invoked by uid 89); 24 Nov 2013 02:12:09 -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:07 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1VkPAv-0006qL-4G from Yao_Qi@mentor.com for gdb-patches@sourceware.org; Sat, 23 Nov 2013 18:11:53 -0800 Received: from SVR-ORW-FEM-02.mgc.mentorg.com ([147.34.96.206]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Sat, 23 Nov 2013 18:11:53 -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:51 -0800 From: Yao Qi To: Subject: [PATCH 05/11] Rename varobj_pretty_printed_p to varobj_is_dynamic_p Date: Sun, 24 Nov 2013 02:12:00 -0000 Message-ID: <1385258996-26047-6-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/msg00738.txt.bz2 We think varobj with --available-children-only behaves like a dynamic varobj, so dyanmic varobj is not pretty-printer specific. We rename varobj_pretty_printed_p to varobj_is_dynamic_p, so that we can handle available-children-only checking in varobj_is_dynamic_p in the next patch. gdb: 2013-11-24 Yao Qi * varobj.c (varobj_pretty_printed_p): Rename to ... (varobj_is_dynamic_p): ... this. New function. * varobj.h (varobj_pretty_printed_p): Remove declaration. (varobj_is_dynamic_p): Declare. * mi/mi-cmd-var.c (print_varobj): Caller update. (mi_print_value_p, varobj_update_one): Likewise. --- gdb/mi/mi-cmd-var.c | 6 +++--- gdb/varobj.c | 4 +++- gdb/varobj.h | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c index 84cdc15..2201630 100644 --- a/gdb/mi/mi-cmd-var.c +++ b/gdb/mi/mi-cmd-var.c @@ -88,7 +88,7 @@ print_varobj (struct varobj *var, enum print_values print_values, xfree (display_hint); } - if (varobj_pretty_printed_p (var)) + if (varobj_is_dynamic_p (var)) ui_out_field_int (uiout, "dynamic", 1); } @@ -352,7 +352,7 @@ mi_print_value_p (struct varobj *var, enum print_values print_values) if (print_values == PRINT_ALL_VALUES) return 1; - if (varobj_pretty_printed_p (var)) + if (varobj_is_dynamic_p (var)) return 1; type = varobj_get_gdb_type (var); @@ -777,7 +777,7 @@ varobj_update_one (struct varobj *var, enum print_values print_values, xfree (display_hint); } - if (varobj_pretty_printed_p (r->varobj)) + if (varobj_is_dynamic_p (r->varobj)) ui_out_field_int (uiout, "dynamic", 1); varobj_get_child_range (r->varobj, &from, &to); diff --git a/gdb/varobj.c b/gdb/varobj.c index e362229..948f80c 100644 --- a/gdb/varobj.c +++ b/gdb/varobj.c @@ -1066,8 +1066,10 @@ varobj_get_attributes (struct varobj *var) return attributes; } +/* Return true if VAR is a dynamic varobj. */ + int -varobj_pretty_printed_p (struct varobj *var) +varobj_is_dynamic_p (struct varobj *var) { return var->dynamic->pretty_printer != NULL; } diff --git a/gdb/varobj.h b/gdb/varobj.h index 0f68311..60ace6f 100644 --- a/gdb/varobj.h +++ b/gdb/varobj.h @@ -306,7 +306,7 @@ extern void varobj_enable_pretty_printing (void); extern int varobj_has_more (struct varobj *var, int to); -extern int varobj_pretty_printed_p (struct varobj *var); +extern int varobj_is_dynamic_p (struct varobj *var); extern struct cleanup *varobj_ensure_python_env (struct varobj *var); -- 1.7.7.6