[gdb/tui,c++17] Fix NULL string_view in tui_partial_win_by_name

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

diff --git a/gdb/tui/tui-win.c b/gdb/tui/tui-win.c
index 336571f158e30d1c7184dbafdd22d30c6acf10bf..f906b0dc4fea4a64cb70efef12c748ad1ef9aaee 100644 (file)
--- a/gdb/tui/tui-win.c
+++ b/gdb/tui/tui-win.c
@@ -660,21 +660,18 @@ tui_partial_win_by_name (gdb::string_view name)
 {
   struct tui_win_info *best = nullptr;
 
-  if (name != NULL)
+  for (tui_win_info *item : all_tui_windows ())
     {
-      for (tui_win_info *item : all_tui_windows ())
-       {
-         const char *cur_name = item->name ();
+      const char *cur_name = item->name ();
 
-         if (name == cur_name)
-           return item;
-         if (startswith (cur_name, name))
-           {
-             if (best != nullptr)
-               error (_("Window name \"%*s\" is ambiguous"),
-                      (int) name.size (), name.data ());
-             best = item;
-           }
+      if (name == cur_name)
+       return item;
+      if (startswith (cur_name, name))
+       {
+         if (best != nullptr)
+           error (_("Window name \"%*s\" is ambiguous"),
+                  (int) name.size (), name.data ());
+         best = item;
        }
     }