Oops! Retract last change. Didn't mean to pollute things with energize just
yet!
This commit is contained in:
parent
3e3b0eb9d9
commit
b36e3a9b49
@ -1,8 +1,5 @@
|
|||||||
Mon Sep 14 19:20:43 1992 Stu Grossman (grossman at cygnus.com)
|
Mon Sep 14 19:20:43 1992 Stu Grossman (grossman at cygnus.com)
|
||||||
|
|
||||||
* utils.c (query): Remove test for energize from top. Now
|
|
||||||
handled in input_from_terminal_p().
|
|
||||||
|
|
||||||
* energize.c (send_location): New routine to consolidate all
|
* energize.c (send_location): New routine to consolidate all
|
||||||
places where we must notify kernel of where the given pc is.
|
places where we must notify kernel of where the given pc is.
|
||||||
(cplus_demangle): Put single-quotes around demangled names.
|
(cplus_demangle): Put single-quotes around demangled names.
|
||||||
|
44
gdb/utils.c
44
gdb/utils.c
@ -703,32 +703,21 @@ query (va_alist)
|
|||||||
fflush (stdout);
|
fflush (stdout);
|
||||||
va_start (args);
|
va_start (args);
|
||||||
ctlstr = va_arg (args, char *);
|
ctlstr = va_arg (args, char *);
|
||||||
energize_query (ctlstr, args);
|
|
||||||
vfprintf_filtered (stdout, ctlstr, args);
|
vfprintf_filtered (stdout, ctlstr, args);
|
||||||
|
va_end (args);
|
||||||
printf_filtered ("(y or n) ");
|
printf_filtered ("(y or n) ");
|
||||||
if (energize)
|
fflush (stdout);
|
||||||
{
|
answer = fgetc (stdin);
|
||||||
char *buf;
|
clearerr (stdin); /* in case of C-d */
|
||||||
|
if (answer == EOF) /* C-d */
|
||||||
buf = energize_command_line_input(0, 0);
|
return 1;
|
||||||
answer = buf ? *buf : 'Y';
|
if (answer != '\n') /* Eat rest of input line, to EOF or newline */
|
||||||
energize_acknowledge_query(buf);
|
do
|
||||||
}
|
{
|
||||||
else
|
ans2 = fgetc (stdin);
|
||||||
{
|
clearerr (stdin);
|
||||||
fflush (stdout);
|
}
|
||||||
answer = fgetc (stdin);
|
while (ans2 != EOF && ans2 != '\n');
|
||||||
clearerr (stdin); /* in case of C-d */
|
|
||||||
if (answer == EOF) /* C-d */
|
|
||||||
return 1;
|
|
||||||
if (answer != '\n') /* Eat rest of input line, to EOF or newline */
|
|
||||||
do
|
|
||||||
{
|
|
||||||
ans2 = fgetc (stdin);
|
|
||||||
clearerr (stdin);
|
|
||||||
}
|
|
||||||
while (ans2 != EOF && ans2 != '\n');
|
|
||||||
}
|
|
||||||
if (answer >= 'a')
|
if (answer >= 'a')
|
||||||
answer -= 040;
|
answer -= 040;
|
||||||
if (answer == 'Y')
|
if (answer == 'Y')
|
||||||
@ -736,7 +725,6 @@ query (va_alist)
|
|||||||
if (answer == 'N')
|
if (answer == 'N')
|
||||||
return 0;
|
return 0;
|
||||||
printf_filtered ("Please answer y or n.\n");
|
printf_filtered ("Please answer y or n.\n");
|
||||||
va_end (args);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1003,12 +991,6 @@ fputs_filtered (linebuffer, stream)
|
|||||||
if (linebuffer == 0)
|
if (linebuffer == 0)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (energize)
|
|
||||||
{
|
|
||||||
energize_fputs(linebuffer);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* Don't do any filtering if it is disabled. */
|
/* Don't do any filtering if it is disabled. */
|
||||||
if (stream != stdout
|
if (stream != stdout
|
||||||
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))
|
|| (lines_per_page == UINT_MAX && chars_per_line == UINT_MAX))
|
||||||
|
Loading…
Reference in New Issue
Block a user