Fix PR gdb/21364: Dead code due to an unreachable condition in osdata.c

Pedro's recent commits enabling -Wwrite-strings has changed a bit the
logic of info_osdata.  Now, 'type' is always non-NULL, so we have to
check if it's an empty string instead of NULL.  One of the checks was
fixed, but there is another that was left behind.  This commit fixes
it.

gdb/ChangeLog:
2017-04-10  Sergio Durigan Junior  <sergiodj@redhat.com>

	PR gdb/21364
	* osdata.c (info_osdata): Check if 'type' is an empty string
	instead of NULL.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e49e7a5a878b52f6feee58971207d9155a317542..2302886900434fd9cfd8574b534da39d6ccb3e3b 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2017-04-10  Sergio Durigan Junior  <sergiodj@redhat.com>
+
+       PR gdb/21364
+       * osdata.c (info_osdata): Check if 'type' is an empty string
+       instead of NULL.
+
 2017-04-10  Pedro Alves  <palves@redhat.com>
 
        * thread.c (add_thread_silent, delete_thread_1, find_thread_ptid)

diff --git a/gdb/osdata.c b/gdb/osdata.c
index 4b33ccbdf64353b4f2703bba1e83e28433f71b84..84c4ed7282c0f175595dde2ef03fa993a6287699 100644 (file)
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -318,7 +318,7 @@ info_osdata (const char *type)
         for a column named "Title", and only include it with MI
         output; this column's normal use is for titles for interface
         elements like menus, and it clutters up CLI output.  */
-      if (!type && !uiout->is_mi_like_p ())
+      if (*type == '\0' && !uiout->is_mi_like_p ())
        {
          struct osdata_column *col;
          int ix;