aboutsummaryrefslogtreecommitdiff
path: root/gdb/osdata.c
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2017-04-05 19:21:35 +0100
committerPedro Alves <palves@redhat.com>2017-04-05 19:21:35 +0100
commitfdf9e36fa2ed39f0da0dfa5dfdbd8e2452c6cb45 (patch)
tree4d8f7801d7622567325071d380d1467629695c77 /gdb/osdata.c
parent9f33b8b7c19413efbb37638bdba54706e4da8573 (diff)
downloadgdb-fdf9e36fa2ed39f0da0dfa5dfdbd8e2452c6cb45.zip
gdb-fdf9e36fa2ed39f0da0dfa5dfdbd8e2452c6cb45.tar.gz
gdb-fdf9e36fa2ed39f0da0dfa5dfdbd8e2452c6cb45.tar.bz2
-Wwrite-strings: MI -info-os
-Wwrite-strings flags this attempt to convert a string literal to "char *": info_osdata_command ("", 0); info_osdata_command is a command function. We could address this by simply passing NULL instead of "". However, I went a little bit further and added a new function that is called by both the CLI and MI. gdb/ChangeLog: 2017-04-05 Pedro Alves <palves@redhat.com> * mi/mi-cmd-info.c (mi_cmd_info_os): Call info_osdata instead of info_osdata_command. * osdata.c (info_osdata_command): Rename to ... (info_osdata): ... this. Constify 'type' parameter, and remove the 'from_tty' parameter. Accept NULL TYPE. (info_osdata_command): New function. * osdata.h (info_osdata_command): Remove declaration. (info_osdata): New declaration.
Diffstat (limited to 'gdb/osdata.c')
-rw-r--r--gdb/osdata.c13
1 files changed, 11 insertions, 2 deletions
diff --git a/gdb/osdata.c b/gdb/osdata.c
index d63ff5a..4b33ccb 100644
--- a/gdb/osdata.c
+++ b/gdb/osdata.c
@@ -287,7 +287,7 @@ get_osdata_column (struct osdata_item *item, const char *name)
}
void
-info_osdata_command (char *type, int from_tty)
+info_osdata (const char *type)
{
struct ui_out *uiout = current_uiout;
struct osdata *osdata = NULL;
@@ -297,12 +297,15 @@ info_osdata_command (char *type, int from_tty)
int nrows;
int col_to_skip = -1;
+ if (type == NULL)
+ type = "";
+
osdata = get_osdata (type);
old_chain = make_cleanup_osdata_free (osdata);
nrows = VEC_length (osdata_item_s, osdata->items);
- if (!type && nrows == 0)
+ if (*type == '\0' && nrows == 0)
error (_("Available types of OS data not reported."));
if (!VEC_empty (osdata_item_s, osdata->items))
@@ -407,6 +410,12 @@ info_osdata_command (char *type, int from_tty)
do_cleanups (old_chain);
}
+static void
+info_osdata_command (char *arg, int from_tty)
+{
+ info_osdata (arg);
+}
+
extern initialize_file_ftype _initialize_osdata; /* -Wmissing-prototypes */
void