2009-07-20 Marc Khouzam <marc.khouzam@ericsson.com>

    * utils.c (defaulted_query): Update comment and remove dead code.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 58a295d65c83ad2316b6db76a269f755195a5a56..de19c96c78c7a77938a132f9d71cdeed0c6742a7 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2009-07-20  Marc Khouzam  <marc.khouzam@ericsson.com>
+
+       * utils.c (defaulted_query): Update comment and remove dead code.
+
 2009-07-20  Doug Evans  <dje@google.com>
 
        Add support for "comdat types" from DWARF4.

diff --git a/gdb/utils.c b/gdb/utils.c
index 3f9d1e721a5208e0ffed1394c811f750be691ac4..89278f60071e6943547bb1c839c8de90735c3acc 100644 (file)
--- 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);