From 7a01c6e0837f09cb0fe23e1d72cd4e303107f85d Mon Sep 17 00:00:00 2001 From: Marc Khouzam Date: Tue, 21 Jul 2009 03:31:18 +0000 Subject: [PATCH] 2009-07-20 Marc Khouzam * utils.c (defaulted_query): Update comment and remove dead code. --- gdb/ChangeLog | 4 ++++ gdb/utils.c | 7 +------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 58a295d65c..de19c96c78 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2009-07-20 Marc Khouzam + + * utils.c (defaulted_query): Update comment and remove dead code. + 2009-07-20 Doug Evans Add support for "comdat types" from DWARF4. diff --git a/gdb/utils.c b/gdb/utils.c index 3f9d1e721a..89278f6007 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1433,7 +1433,7 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) return def_value; /* If input isn't coming from the user directly, just say what - question we're asking, and then answer "yes" automatically. This + question we're asking, and then answer the default automatically. This way, important error messages don't get lost when talking to GDB over a pipe. */ if (! input_from_terminal_p ()) @@ -1448,11 +1448,6 @@ defaulted_query (const char *ctlstr, const char defchar, va_list args) return def_value; } - /* Automatically answer the default value if input is not from the user - directly, or if the user did not want prompts. */ - if (!input_from_terminal_p () || !caution) - return def_value; - if (deprecated_query_hook) { return deprecated_query_hook (ctlstr, args);