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-logging.c
diff --git
a/gdb/cli/cli-logging.c
b/gdb/cli/cli-logging.c
index ce82b77121ed1fcbfbcbf176610fb57149fdb2d9..46c23064fc37a07df385a7577ae5d6e3a2f1f8f4 100644
(file)
--- a/
gdb/cli/cli-logging.c
+++ b/
gdb/cli/cli-logging.c
@@
-1,6
+1,6
@@
/* Command-line output logging for GDB, the GNU debugger.
/* Command-line output logging for GDB, the GNU debugger.
- Copyright (C) 2003-201
4
Free Software Foundation, Inc.
+ Copyright (C) 2003-201
6
Free Software Foundation, Inc.
This file is part of GDB.
This file is part of GDB.
@@
-134,8
+134,8
@@
set_logging_redirect (char *args, int from_tty, struct cmd_list_element *c)
neither of it. At least do not try to push OUTPUT if the pop
already failed. */
neither of it. At least do not try to push OUTPUT if the pop
already failed. */
- if (ui
_out_redirect (uiout,
NULL) < 0
- || ui
_out_redirect (uiout,
output) < 0)
+ if (ui
out->redirect (
NULL) < 0
+ || ui
out->redirect (
output) < 0)
warning (_("Current output protocol does not support redirection"));
do_cleanups (cleanups);
warning (_("Current output protocol does not support redirection"));
do_cleanups (cleanups);
@@
-177,7
+177,9
@@
pop_output_files (void)
saved_output.targ = NULL;
saved_output.targerr = NULL;
saved_output.targ = NULL;
saved_output.targerr = NULL;
- ui_out_redirect (current_uiout, NULL);
+ /* Stay consistent with handle_redirections. */
+ if (!current_uiout->is_mi_like_p ())
+ current_uiout->redirect (NULL);
}
/* This is a helper for the `set logging' command. */
}
/* This is a helper for the `set logging' command. */
@@
-243,9
+245,9
@@
handle_redirections (int from_tty)
}
/* Don't do the redirect for MI, it confuses MI's ui-out scheme. */
}
/* Don't do the redirect for MI, it confuses MI's ui-out scheme. */
- if (!
ui_out_is_mi_like_p (current_uiout
))
+ if (!
current_uiout->is_mi_like_p (
))
{
{
- if (
ui_out_redirect (current_uiout,
output) < 0)
+ if (
current_uiout->redirect (
output) < 0)
warning (_("Current output protocol does not support redirection"));
}
}
warning (_("Current output protocol does not support redirection"));
}
}
This page took
0.025751 seconds
and
4
git commands to generate.