FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* osdata.c (info_osdata_command): Filter out "Title" columns

Browse source 
from non-MI uses.
	* common/linux-osdata.c (struct osdata_type): Add title field.
	(osdata_table): Add titles to each entry.
	(linux_command_xfer_osdata): Add a column for title data.

	* gdb.texinfo (Miscellaneous GDB/MI Commands): Update -info-os
	example, add note about title column.
This commit is contained in:
Stan Shebs 2012-06-28 23:44:26 +00:00
parent 37ce89ebb2
commit 71caed8383
5 changed files with 84 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

33
gdb/osdata.c
View file

@ -297,6 +297,7 @@ info_osdata_command (char *type, int from_tty)
struct cleanup *old_chain;
int ncols = 0;
int nrows;
int col_to_skip = -1;
osdata = get_osdata (type);
old_chain = make_cleanup_osdata_free (osdata);
@ -311,6 +312,28 @@ info_osdata_command (char *type, int from_tty)
last = VEC_last (osdata_item_s, osdata->items);
if (last->columns)
ncols = VEC_length (osdata_column_s, last->columns);
/* As a special case, scan the listing of available data types
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 && !ui_out_is_mi_like_p (uiout))
{
struct osdata_column *col;
int ix;
for (ix = 0;
VEC_iterate (osdata_column_s, last->columns, ix, col);
ix++)
{
if (strcmp (col->name, "Title") == 0)
col_to_skip = ix;
}
/* Be sure to reduce the total column count, otherwise
internal errors ensue. */
if (col_to_skip >= 0)
--ncols;
}
}
make_cleanup_ui_out_table_begin_end (uiout, ncols, nrows,
@ -335,7 +358,10 @@ info_osdata_command (char *type, int from_tty)
ix++)
{
char col_name[32];
if (ix == col_to_skip)
continue;
snprintf (col_name, 32, "col%d", ix);
ui_out_table_header (uiout, 10, ui_left,
col_name, col->name);
@ -366,7 +392,10 @@ info_osdata_command (char *type, int from_tty)
ix_cols++)
{
char col_name[32];
if (ix_cols == col_to_skip)
continue;
snprintf (col_name, 32, "col%d", ix_cols);
ui_out_field_string (uiout, col_name, col->value);
}