From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 48531 invoked by alias); 22 Sep 2015 14:53:56 -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 48510 invoked by uid 89); 22 Sep 2015 14:53:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,SPF_PASS autolearn=ham version=3.3.2 X-HELO: usevmg20.ericsson.net Received: from usevmg20.ericsson.net (HELO usevmg20.ericsson.net) (198.24.6.45) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-SHA encrypted) ESMTPS; Tue, 22 Sep 2015 14:53:53 +0000 Received: from EUSAAHC003.ericsson.se (Unknown_Domain [147.117.188.81]) by usevmg20.ericsson.net (Symantec Mail Security) with SMTP id 49.FC.32596.46C01065; Tue, 22 Sep 2015 10:08:04 +0200 (CEST) Received: from [142.133.110.144] (147.117.188.8) by smtp-am.internal.ericsson.com (147.117.188.83) with Microsoft SMTP Server id 14.3.248.2; Tue, 22 Sep 2015 10:53:50 -0400 Subject: Re: [PATCH] tui: Simplify tui_alloc_content To: Andrew Burgess References: <1442877416-16659-1-git-send-email-simon.marchi@ericsson.com> <20150922075033.GB5430@embecosm.com> CC: From: Simon Marchi Message-ID: <56016B7E.70501@ericsson.com> Date: Tue, 22 Sep 2015 14:53:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.2.0 MIME-Version: 1.0 In-Reply-To: <20150922075033.GB5430@embecosm.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-IsSubscribed: yes X-SW-Source: 2015-09/txt/msg00524.txt.bz2 On 15-09-22 03:50 AM, Andrew Burgess wrote: > * Simon Marchi [2015-09-21 19:16:56 -0400]: > >> >> gdb/ChangeLog: >> >> * tui/tui-data.c (tui_alloc_content): Don't check xmalloc >> result. Change type of element_block_ptr. Change allocation to >> use XNEWVEC. >> --- >> gdb/tui/tui-data.c | 41 ++++++++++++++--------------------------- >> 1 file changed, 14 insertions(+), 27 deletions(-) >> >> diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c >> index 2fcd547..ca7502d 100644 >> --- a/gdb/tui/tui-data.c >> +++ b/gdb/tui/tui-data.c >> @@ -573,40 +573,27 @@ tui_win_content >> tui_alloc_content (int num_elements, enum tui_win_type type) >> { >> tui_win_content content; >> - char *element_block_ptr; >> + struct tui_win_element *element_block_ptr; >> int i; >> >> content = XNEWVEC (struct tui_win_element *, num_elements); >> - if (content != NULL) >> + >> + /* >> + * All windows, except the data window, can allocate the >> + * elements in a chunk. The data window cannot because items >> + * can be added/removed from the data display by the user at any >> + * time. >> + */ >> + if (type != DATA_WIN) >> { >> - /* >> - * All windows, except the data window, can allocate the >> - * elements in a chunk. The data window cannot because items >> - * can be added/removed from the data display by the user at any >> - * time. >> - */ >> - if (type != DATA_WIN) >> + element_block_ptr = XNEWVEC (struct tui_win_element, num_elements); >> + for (i = 0; i < num_elements; i++) >> { >> - element_block_ptr = >> - xmalloc (sizeof (struct tui_win_element) * num_elements); >> - if (element_block_ptr != NULL) >> - { >> - for (i = 0; i < num_elements; i++) >> - { >> - content[i] = (struct tui_win_element *) element_block_ptr; >> - init_content_element (content[i], type); >> - element_block_ptr += sizeof (struct tui_win_element); >> - } >> - } >> - else >> - { >> - xfree (content); >> - content = (tui_win_content) NULL; >> - } >> + content[i] = element_block_ptr; >> + init_content_element (content[i], type); >> + element_block_ptr++; >> } >> } >> - >> - return content; >> } > > Doesn't that leave the function without a return? > > Thanks, > Andrew Oops, of course the return needs to stay, otherwise it doesn't even build. I have it fixed locally but forgot to amend the commit. Thanks!