Don't cast a tui_win_info directly to tui_gen_win_info

[deliverable/binutils-gdb.git] / gdb / tui / tui-stack.c

diff --git a/gdb/tui/tui-stack.c b/gdb/tui/tui-stack.c
index d5273192b1c587ee8f14a568f03253ffe95fa2da..b7e7ae81dff2368c8ebce13d140dc995d63c34a2 100644 (file)
--- a/gdb/tui/tui-stack.c
+++ b/gdb/tui/tui-stack.c
@@ -1,6 +1,6 @@
 /* TUI display locator.
 
-   Copyright (C) 1998-2018 Free Software Foundation, Inc.
+   Copyright (C) 1998-2019 Free Software Foundation, Inc.
 
    Contributed by Hewlett-Packard Company.
 
@@ -72,10 +72,14 @@ tui_make_status_line (struct tui_locator_element *loc)
   int pid_width;
   int line_width;
 
+  std::string pid_name_holder;
   if (inferior_ptid == null_ptid)
     pid_name = "No process";
   else
-    pid_name = target_pid_to_str (inferior_ptid);
+    {
+      pid_name_holder = target_pid_to_str (inferior_ptid);
+      pid_name = pid_name_holder.c_str ();
+    }
 
   target_width = strlen (target_shortname);
   if (target_width > MAX_TARGET_WIDTH)
@@ -246,7 +250,7 @@ tui_show_locator_content (void)
 
   locator = tui_locator_win_info_ptr ();
 
-  if (locator != NULL && locator->handle != (WINDOW *) NULL)
+  if (locator != NULL && locator->handle != NULL)
     {
       struct tui_win_element *element;
 
@@ -410,8 +414,7 @@ tui_show_frame_info (struct frame_info *fi)
          else
            {
              if (find_pc_partial_function (get_frame_pc (fi),
-                                           (const char **) NULL,
-                                           &low, NULL) == 0)
+                                           NULL, &low, NULL) == 0)
                {
                  /* There is no symbol available for current PC.  There is no
                     safe way how to "disassemble backwards".  */
@@ -491,7 +494,7 @@ _initialize_tui_stack (void)
 {
   add_com ("update", class_tui, tui_update_command,
           _("Update the source window and locator to "
-            "display the current execution point.\n"));
+            "display the current execution point."));
 }
 
 /* Command to update the display with the current execution point.  */