projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Class-ify ui_out
[deliverable/binutils-gdb.git]
/
gdb
/
cli
/
cli-setshow.c
diff --git
a/gdb/cli/cli-setshow.c
b/gdb/cli/cli-setshow.c
index 09bf28dab23c682796baf7a83875aa21d9591533..5f2cd03cfcbd34a41b5f7a7e96b0c98386a5e773 100644
(file)
--- a/
gdb/cli/cli-setshow.c
+++ b/
gdb/cli/cli-setshow.c
@@
-1,6
+1,6
@@
/* Handle set and show GDB commands.
/* Handle set and show GDB commands.
- Copyright (C) 2000-201
5
Free Software Foundation, Inc.
+ Copyright (C) 2000-201
6
Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-37,8
+37,8
@@
notify_command_param_changed_p (int param_changed, struct cmd_list_element *c)
if (param_changed == 0)
return 0;
if (param_changed == 0)
return 0;
- if (c->
class == class_maintenance || c->
class == class_deprecated
- || c->class == class_obscure)
+ if (c->
theclass == class_maintenance || c->the
class == class_deprecated
+ || c->
the
class == class_obscure)
return 0;
return 1;
return 0;
return 1;
@@
-158,16
+158,16
@@
do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
{
case var_string:
{
{
case var_string:
{
- char *new;
+ char *new
obj
;
const char *p;
char *q;
int ch;
if (arg == NULL)
arg = "";
const char *p;
char *q;
int ch;
if (arg == NULL)
arg = "";
- new = (char *) xmalloc (strlen (arg) + 2);
+ new
obj
= (char *) xmalloc (strlen (arg) + 2);
p = arg;
p = arg;
- q = new;
+ q = new
obj
;
while ((ch = *p++) != '\000')
{
if (ch == '\\')
while ((ch = *p++) != '\000')
{
if (ch == '\\')
@@
-195,18
+195,18
@@
do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
*q++ = ' ';
#endif
*q++ = '\0';
*q++ = ' ';
#endif
*q++ = '\0';
- new
= (char *) xrealloc (new, q - new
);
+ new
obj = (char *) xrealloc (newobj, q - newobj
);
if (*(char **) c->var == NULL
if (*(char **) c->var == NULL
- || strcmp (*(char **) c->var, new) != 0)
+ || strcmp (*(char **) c->var, new
obj
) != 0)
{
xfree (*(char **) c->var);
{
xfree (*(char **) c->var);
- *(char **) c->var = new;
+ *(char **) c->var = new
obj
;
option_changed = 1;
}
else
option_changed = 1;
}
else
- xfree (new);
+ xfree (new
obj
);
}
break;
case var_string_noescape:
}
break;
case var_string_noescape:
@@
-361,7
+361,7
@@
do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
int len;
int nmatches;
const char *match = NULL;
int len;
int nmatches;
const char *match = NULL;
- char *p;
+ c
onst c
har *p;
/* If no argument was supplied, print an informative error
message. */
/* If no argument was supplied, print an informative error
message. */
@@
-373,7
+373,7
@@
do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
for (i = 0; c->enums[i]; i++)
msg_len += strlen (c->enums[i]) + 2;
for (i = 0; c->enums[i]; i++)
msg_len += strlen (c->enums[i]) + 2;
- msg = xmalloc (msg_len);
+ msg =
(char *)
xmalloc (msg_len);
*msg = '\0';
make_cleanup (xfree, msg);
*msg = '\0';
make_cleanup (xfree, msg);
@@
-475,8
+475,8
@@
do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
p = p->prefix;
}
p = p->prefix;
}
- cp = name = xmalloc (length);
- cmds =
xmalloc (sizeof (struct cmd_list_element *) *
i);
+ cp = name =
(char *)
xmalloc (length);
+ cmds =
XNEWVEC (struct cmd_list_element *,
i);
/* Track back through filed 'prefix' and cache them in CMDS. */
for (i = 0, p = c; p != NULL; i++)
/* Track back through filed 'prefix' and cache them in CMDS. */
for (i = 0, p = c; p != NULL; i++)
@@
-523,7
+523,7
@@
do_set_command (const char *arg, int from_tty, struct cmd_list_element *c)
break;
case var_boolean:
{
break;
case var_boolean:
{
- char *opt = *(int *) c->var ? "on" : "off";
+ c
onst c
har *opt = *(int *) c->var ? "on" : "off";
observer_notify_command_param_changed (name, opt);
}
observer_notify_command_param_changed (name, opt);
}
@@
-649,17
+649,16
@@
do_show_command (const char *arg, int from_tty, struct cmd_list_element *c)
code to print the value out. For the latter there should be
MI and CLI specific versions. */
code to print the value out. For the latter there should be
MI and CLI specific versions. */
- if (ui
_out_is_mi_like_p (uiout
))
- ui
_out_field_stream (uiout,
"value", stb);
+ if (ui
out->is_mi_like_p (
))
+ ui
out->field_stream (
"value", stb);
else
{
else
{
-
char *value = ui_file_xstrdup (stb, NULL
);
+
std::string value = ui_file_as_string (stb
);
- make_cleanup (xfree, value);
if (c->show_value_func != NULL)
if (c->show_value_func != NULL)
- c->show_value_func (gdb_stdout, from_tty, c, value);
+ c->show_value_func (gdb_stdout, from_tty, c, value
.c_str ()
);
else
else
- deprecated_show_value_hack (gdb_stdout, from_tty, c, value);
+ deprecated_show_value_hack (gdb_stdout, from_tty, c, value
.c_str ()
);
}
do_cleanups (old_chain);
}
do_cleanups (old_chain);
@@
-683,24
+682,24
@@
cmd_show_list (struct cmd_list_element *list, int from_tty, const char *prefix)
{
struct cleanup *optionlist_chain
= make_cleanup_ui_out_tuple_begin_end (uiout, "optionlist");
{
struct cleanup *optionlist_chain
= make_cleanup_ui_out_tuple_begin_end (uiout, "optionlist");
- char *new_prefix = strstr (list->prefixname, "show ") + 5;
+ c
onst c
har *new_prefix = strstr (list->prefixname, "show ") + 5;
- if (ui
_out_is_mi_like_p (uiout
))
- ui
_out_field_string (uiout,
"prefix", new_prefix);
+ if (ui
out->is_mi_like_p (
))
+ ui
out->field_string (
"prefix", new_prefix);
cmd_show_list (*list->prefixlist, from_tty, new_prefix);
/* Close the tuple. */
do_cleanups (optionlist_chain);
}
else
{
cmd_show_list (*list->prefixlist, from_tty, new_prefix);
/* Close the tuple. */
do_cleanups (optionlist_chain);
}
else
{
- if (list->class != no_set_class)
+ if (list->
the
class != no_set_class)
{
struct cleanup *option_chain
= make_cleanup_ui_out_tuple_begin_end (uiout, "option");
{
struct cleanup *option_chain
= make_cleanup_ui_out_tuple_begin_end (uiout, "option");
- ui
_out_text (uiout,
prefix);
- ui
_out_field_string (uiout,
"name", list->name);
- ui
_out_text (uiout,
": ");
+ ui
out->text (
prefix);
+ ui
out->field_string (
"name", list->name);
+ ui
out->text (
": ");
if (list->type == show_cmd)
do_show_command ((char *) NULL, from_tty, list);
else
if (list->type == show_cmd)
do_show_command ((char *) NULL, from_tty, list);
else
This page took
0.030222 seconds
and
4
git commands to generate.