From patchwork Mon Nov 24 17:06:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Kratochvil X-Patchwork-Id: 3884 Received: (qmail 13805 invoked by alias); 24 Nov 2014 17:06:45 -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 13786 invoked by uid 89); 24 Nov 2014 17:06:44 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.9 required=5.0 tests=AWL, BAYES_00, SPF_HELO_PASS, T_RP_MATCHES_RCVD 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 (AES256-GCM-SHA384 encrypted) ESMTPS; Mon, 24 Nov 2014 17:06:44 +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 sAOH6flg010533 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Mon, 24 Nov 2014 12:06:42 -0500 Received: from host2.jankratochvil.net (ovpn-116-31.ams2.redhat.com [10.36.116.31]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id sAOH6cl7023070 (version=TLSv1/SSLv3 cipher=AES128-GCM-SHA256 bits=128 verify=NO) for ; Mon, 24 Nov 2014 12:06:41 -0500 Date: Mon, 24 Nov 2014 18:06:38 +0100 From: Jan Kratochvil To: gdb-patches@sourceware.org Subject: [obv] Reindent code (resolve_dynamic_type_internal) Message-ID: <20141124170638.GA22454@host2.jankratochvil.net> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.23 (2014-03-12) X-IsSubscribed: yes gdb/ChangeLog 2014-11-24 Jan Kratochvil * gdbtypes.c (resolve_dynamic_type_internal): Reindent the code. --- gdb/ChangeLog | 4 ++++ gdb/gdbtypes.c | 40 ++++++++++++++++++++-------------------- 2 files changed, 24 insertions(+), 20 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 506dc61..7726bd2 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2014-11-24 Jan Kratochvil + + * gdbtypes.c (resolve_dynamic_type_internal): Reindent the code. + 2014-11-24 Samuel Thibault Pushed by Joel Brobecker diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index 976d56f..61d259d 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1877,31 +1877,31 @@ resolve_dynamic_type_internal (struct type *type, CORE_ADDR addr, switch (TYPE_CODE (type)) { - case TYPE_CODE_TYPEDEF: + case TYPE_CODE_TYPEDEF: + resolved_type = copy_type (type); + TYPE_TARGET_TYPE (resolved_type) + = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), addr, + top_level); + break; + + case TYPE_CODE_REF: + { + CORE_ADDR target_addr = read_memory_typed_address (addr, type); + resolved_type = copy_type (type); TYPE_TARGET_TYPE (resolved_type) - = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), addr, - top_level); + = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), + target_addr, top_level); break; + } - case TYPE_CODE_REF: - { - CORE_ADDR target_addr = read_memory_typed_address (addr, type); - - resolved_type = copy_type (type); - TYPE_TARGET_TYPE (resolved_type) - = resolve_dynamic_type_internal (TYPE_TARGET_TYPE (type), - target_addr, top_level); - break; - } - - case TYPE_CODE_ARRAY: - resolved_type = resolve_dynamic_array (type, addr); - break; + case TYPE_CODE_ARRAY: + resolved_type = resolve_dynamic_array (type, addr); + break; - case TYPE_CODE_RANGE: - resolved_type = resolve_dynamic_range (type, addr); - break; + case TYPE_CODE_RANGE: + resolved_type = resolve_dynamic_range (type, addr); + break; case TYPE_CODE_UNION: resolved_type = resolve_dynamic_union (type, addr);