From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 15018 invoked by alias); 16 Jun 2019 15:25:14 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 14979 invoked by uid 306); 16 Jun 2019 15:25:13 -0000 Date: Sun, 16 Jun 2019 15:25:00 -0000 Message-ID: <20190616152513.14977.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Remove some NULL checks from the TUI X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: e79be6e5f33d52b2bbb6aafdc61659a4bbb55849 X-Git-Newrev: 730ead81dfffc181f79a4b79ba8abf6850e63596 X-SW-Source: 2019-06/txt/msg00092.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=730ead81dfffc181f79a4b79ba8abf6850e63596 commit 730ead81dfffc181f79a4b79ba8abf6850e63596 Author: Tom Tromey Date: Sat Jun 15 16:06:27 2019 -0600 Remove some NULL checks from the TUI I found a few spots in the TUI that were NULL-checking the result of XNEW. This cannot return NULL, so this patch removes the checks. gdb/ChangeLog 2019-06-16 Tom Tromey * tui/tui-data.c (tui_alloc_generic_win_info) (tui_alloc_win_info, tui_add_content_elements): Remove NULL checks. Diff: --- gdb/ChangeLog | 6 ++++++ gdb/tui/tui-data.c | 22 ++++++---------------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index af91a3c..6e58fc8 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-06-16 Tom Tromey + + * tui/tui-data.c (tui_alloc_generic_win_info) + (tui_alloc_win_info, tui_add_content_elements): Remove NULL + checks. + 2019-06-16 Bernhard Heckel Andrew Burgess diff --git a/gdb/tui/tui-data.c b/gdb/tui/tui-data.c index d5f7c73..7c14305 100644 --- a/gdb/tui/tui-data.c +++ b/gdb/tui/tui-data.c @@ -424,8 +424,7 @@ tui_alloc_generic_win_info (void) { struct tui_gen_win_info *win = XNEW (struct tui_gen_win_info); - if (win != NULL) - tui_init_generic_part (win); + tui_init_generic_part (win); return win; } @@ -537,11 +536,8 @@ tui_alloc_win_info (enum tui_win_type type) { struct tui_win_info *win_info = XNEW (struct tui_win_info); - if (win_info != NULL) - { - win_info->generic.type = type; - init_win_info (win_info); - } + win_info->generic.type = type; + init_win_info (win_info); return win_info; } @@ -602,15 +598,9 @@ tui_add_content_elements (struct tui_gen_win_info *win_info, for (i = index_start; (i < num_elements + index_start); i++) { element_ptr = XNEW (struct tui_win_element); - if (element_ptr != NULL) - { - win_info->content[i] = element_ptr; - init_content_element (element_ptr, win_info->type); - win_info->content_size++; - } - else /* Things must be really hosed now! We ran out of - memory!? */ - return (-1); + win_info->content[i] = element_ptr; + init_content_element (element_ptr, win_info->type); + win_info->content_size++; } }