This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 7/8] Replace all usage errors with calls to error
- From: Gary Benson <gbenson at redhat dot com>
- To: gdb-patches at sourceware dot org
- Date: Wed, 6 Aug 2014 11:12:27 +0100
- Subject: [PATCH 7/8] Replace all usage errors with calls to error
- Authentication-results: sourceware.org; auth=none
- References: <1407319948-2264-1-git-send-email-gbenson at redhat dot com>
This commit replaces the hardwired fprintf/exit error handlers
for usage errors with calls to error.
gdb/
2014-08-06 Gary Benson <gbenson@redhat.com>
* main.c (captured_main): Handle usage errors with error.
---
gdb/ChangeLog | 4 ++++
gdb/main.c | 40 ++++++++++------------------------------
2 files changed, 14 insertions(+), 30 deletions(-)
diff --git a/gdb/main.c b/gdb/main.c
index 2f99157..a850edf 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -689,10 +689,7 @@ captured_main (void *data)
xfree (interpreter_p);
interpreter_p = xstrdup (INTERP_TUI);
#else
- fprintf_unfiltered (gdb_stderr,
- _("%s: TUI mode is not supported\n"),
- argv[0]);
- exit (1);
+ error (_("%s: TUI mode is not supported"), gdb_program_name);
#endif
break;
case OPT_WINDOWS:
@@ -758,13 +755,8 @@ captured_main (void *data)
break;
case 'D':
if (optarg[0] == '\0')
- {
- fprintf_unfiltered (gdb_stderr,
- _("%s: empty path for"
- " `--data-directory'\n"),
- argv[0]);
- exit (1);
- }
+ error (_("%s: empty path for `--data-directory'"),
+ gdb_program_name);
set_gdb_data_directory (optarg);
gdb_datadir_provided = 1;
break;
@@ -774,13 +766,8 @@ captured_main (void *data)
extern int gdbtk_test (char *);
if (!gdbtk_test (optarg))
- {
- fprintf_unfiltered (gdb_stderr,
- _("%s: unable to load "
- "tclcommand file \"%s\""),
- argv[0], optarg);
- exit (1);
- }
+ error (_("%s: unable to load tclcommand file \"%s\""),
+ gdb_program_name, optarg);
break;
}
case 'y':
@@ -853,11 +840,8 @@ captured_main (void *data)
break;
case '?':
- fprintf_unfiltered (gdb_stderr,
- _("Use `%s --help' for a "
- "complete list of options.\n"),
- argv[0]);
- exit (1);
+ error (_("Use `%s --help' for a complete list of options."),
+ gdb_program_name);
}
}
@@ -880,13 +864,9 @@ captured_main (void *data)
inferior. The first one is the sym/exec file, and the rest
are arguments. */
if (optind >= argc)
- {
- fprintf_unfiltered (gdb_stderr,
- _("%s: `--args' specified but "
- "no program specified\n"),
- argv[0]);
- exit (1);
- }
+ error (_("%s: `--args' specified but no program specified"),
+ gdb_program_name);
+
symarg = argv[optind];
execarg = argv[optind];
++optind;
--
1.7.1