From: Tom Tromey <tom@tromey.com>
Date: Sun, 16 Jun 2019 23:51:01 +0000 (-0600)
Subject: Remove NULL check from tui_set_exec_info_content
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3332534318eb10a77e441307d28336996325558c;p=binutils-gdb.git

Remove NULL check from tui_set_exec_info_content

tui_set_exec_info_content ensures that the window's "execution_info"
is allocated, so the NULL check here is redundant and can be removed.

gdb/ChangeLog
2019-06-25  Tom Tromey  <tom@tromey.com>

	* tui/tui-winsource.c (tui_set_exec_info_content): Remove NULL
	check.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a97cfde736d..feec185ffb2 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2019-06-25  Tom Tromey  <tom@tromey.com>
+
+	* tui/tui-winsource.c (tui_set_exec_info_content): Remove NULL
+	check.
+
 2019-06-25  Tom Tromey  <tom@tromey.com>
 
 	* tui/tui-winsource.h (tui_alloc_source_buffer): Change return
diff --git a/gdb/tui/tui-winsource.c b/gdb/tui/tui-winsource.c
index 209d33d6c99..5e60e9e3726 100644
--- a/gdb/tui/tui-winsource.c
+++ b/gdb/tui/tui-winsource.c
@@ -495,46 +495,40 @@ tui_set_exec_info_content (struct tui_win_info *win_info)
       if (exec_info_ptr->content == NULL)
 	exec_info_ptr->content =
 	  tui_alloc_content (win_info->height, exec_info_ptr->type);
-      if (exec_info_ptr->content != NULL)
-	{
-	  int i;
 
-          tui_update_breakpoint_info (win_info, 1);
-	  for (i = 0; i < win_info->content_size; i++)
-	    {
-	      struct tui_win_element *element;
-	      struct tui_win_element *src_element;
-              int mode;
-
-	      element = exec_info_ptr->content[i];
-	      src_element = win_info->content[i];
-
-              memset(element->which_element.simple_string, ' ',
-                     sizeof(element->which_element.simple_string));
-              element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0;
-
-	      /* Now update the exec info content based upon the state
-                 of each line as indicated by the source content.  */
-              mode = src_element->which_element.source.has_break;
-              if (mode & TUI_BP_HIT)
-                element->which_element.simple_string[TUI_BP_HIT_POS] =
-                  (mode & TUI_BP_HARDWARE) ? 'H' : 'B';
-              else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED))
-                element->which_element.simple_string[TUI_BP_HIT_POS] =
-                  (mode & TUI_BP_HARDWARE) ? 'h' : 'b';
-
-              if (mode & TUI_BP_ENABLED)
-                element->which_element.simple_string[TUI_BP_BREAK_POS] = '+';
-              else if (mode & TUI_BP_DISABLED)
-                element->which_element.simple_string[TUI_BP_BREAK_POS] = '-';
-
-              if (src_element->which_element.source.is_exec_point)
-                element->which_element.simple_string[TUI_EXEC_POS] = '>';
-	    }
-	  exec_info_ptr->content_size = win_info->content_size;
+      tui_update_breakpoint_info (win_info, 1);
+      for (int i = 0; i < win_info->content_size; i++)
+	{
+	  struct tui_win_element *element;
+	  struct tui_win_element *src_element;
+	  int mode;
+
+	  element = exec_info_ptr->content[i];
+	  src_element = win_info->content[i];
+
+	  memset(element->which_element.simple_string, ' ',
+		 sizeof(element->which_element.simple_string));
+	  element->which_element.simple_string[TUI_EXECINFO_SIZE - 1] = 0;
+
+	  /* Now update the exec info content based upon the state
+	     of each line as indicated by the source content.  */
+	  mode = src_element->which_element.source.has_break;
+	  if (mode & TUI_BP_HIT)
+	    element->which_element.simple_string[TUI_BP_HIT_POS] =
+	      (mode & TUI_BP_HARDWARE) ? 'H' : 'B';
+	  else if (mode & (TUI_BP_ENABLED | TUI_BP_DISABLED))
+	    element->which_element.simple_string[TUI_BP_HIT_POS] =
+	      (mode & TUI_BP_HARDWARE) ? 'h' : 'b';
+
+	  if (mode & TUI_BP_ENABLED)
+	    element->which_element.simple_string[TUI_BP_BREAK_POS] = '+';
+	  else if (mode & TUI_BP_DISABLED)
+	    element->which_element.simple_string[TUI_BP_BREAK_POS] = '-';
+
+	  if (src_element->which_element.source.is_exec_point)
+	    element->which_element.simple_string[TUI_EXEC_POS] = '>';
 	}
-      else
-	ret = TUI_FAILURE;
+      exec_info_ptr->content_size = win_info->content_size;
     }
 
   return ret;