OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Gary Benson 2014-08-05 16:18:51 +01:00
parent 91b35fd05c
commit 075c703382
2 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2014-08-29 Gary Benson <gbenson@redhat.com>
* main.c (captured_main): Use warning during startup.
Prefix startup warning messages with command name.
2014-08-29 Gary Benson <gbenson@redhat.com>
* main.c (captured_main): Handle usage errors with error.

31
gdb/main.c
View File

@ -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.