aboutsummaryrefslogtreecommitdiff
path: root/gdb/main.c
diff options
context:
space:
mode:
authorGary Benson <gbenson@redhat.com>2014-08-05 16:18:51 +0100
committerGary Benson <gbenson@redhat.com>2014-08-29 10:12:04 +0100
commit075c703382f5bed4ec0976dd11f3b5b694ce3cb1 (patch)
treef60cc86905128edd68f53320f6218bf640d963c2 /gdb/main.c
parent91b35fd05c777ffba9b1738711d470977779c687 (diff)
downloadgdb-075c703382f5bed4ec0976dd11f3b5b694ce3cb1.zip
gdb-075c703382f5bed4ec0976dd11f3b5b694ce3cb1.tar.gz
gdb-075c703382f5bed4ec0976dd11f3b5b694ce3cb1.tar.bz2
Unify startup and option-parsing warnings
Various warnings are emitted during startup and option-parsing using fprintf_unfiltered. One warning is prefixed with the command name, the others are not. This commit replaces these hardwired warnings with calls to warning. It also sets warning_pre_print to prefix all warnings with the command name until option parsing is complete. gdb/ChangeLog: * main.c (captured_main): Use warning during startup. Prefix startup warning messages with command name.
Diffstat (limited to 'gdb/main.c')
-rw-r--r--gdb/main.c31
1 files changed, 10 insertions, 21 deletions
diff --git a/gdb/main.c b/gdb/main.c
index d2e3d5e..12f0146 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -517,14 +517,12 @@ captured_main (void *data)
gdb_program_name = xstrdup (argv[0]);
#endif
+ /* Prefix warning messages with the command name. */
+ warning_pre_print = xstrprintf ("%s: warning: ", gdb_program_name);
+
if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
- /* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
- fprintf_unfiltered (gdb_stderr,
- _("%s: warning: error finding "
- "working directory: %s\n"),
- argv[0], safe_strerror (errno));
-
+ perror_warning_with_name (_("error finding working directory"));
+
current_directory = gdb_dirbuf;
/* Set the sysroot path. */
@@ -807,13 +805,8 @@ captured_main (void *data)
i = strtol (optarg, &p, 0);
if (i == 0 && p == optarg)
-
- /* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
-
- fprintf_unfiltered
- (gdb_stderr,
- _("warning: could not set baud rate to `%s'.\n"), optarg);
+ warning (_("could not set baud rate to `%s'."),
+ optarg);
else
baud_rate = i;
}
@@ -825,13 +818,8 @@ captured_main (void *data)
i = strtol (optarg, &p, 0);
if (i == 0 && p == optarg)
-
- /* Don't use *_filtered or warning() (which relies on
- current_target) until after initialize_all_files(). */
-
- fprintf_unfiltered (gdb_stderr,
- _("warning: could not set "
- "timeout limit to `%s'.\n"), optarg);
+ warning (_("could not set timeout limit to `%s'."),
+ optarg);
else
remote_timeout = i;
}
@@ -985,6 +973,7 @@ captured_main (void *data)
}
/* Set off error and warning messages with a blank line. */
+ xfree (warning_pre_print);
warning_pre_print = _("\nwarning: ");
/* Read and execute the system-wide gdbinit file, if it exists.