From: Gary Benson <gbenson@redhat.com>
Date: Mon, 4 Aug 2014 13:08:46 +0000 (+0100)
Subject: Replace hardwired error handler in captured_main
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd0ef3dda9fa7af181d059e4b3e26c17c1385c0d;p=binutils-gdb.git

Replace hardwired error handler in captured_main

If the requested interpreter cannot be set captured_main reports the
error with a hardwired fprintf/exit pair.  A fprintf/exit pair on the
previous line was replaced with a call to error in March 2003
(https://sourceware.org/ml/gdb-patches/2003-03/msg00444.html) but I
found no documentation as to why this particular hardwired handler
was left untouched.  I was also unable to come up with a situation
where error would not be suitable, so I have replaced it with a call
to error.

gdb/ChangeLog:

	* main.c (captured_main): Replace a fprintf/exit
	pair with a call to error.  Wrap the message with _().
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 809afe5e733..889896278bb 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-29  Gary Benson  <gbenson@redhat.com>
+
+	* main.c (captured_main): Replace a fprintf/exit
+	pair with a call to error.  Wrap the message with _().
+
 2014-08-29  Gary Benson  <gbenson@redhat.com>
 
 	* tui/tui-io.c (tui_initialize_io): Replace two fprintf/exit
diff --git a/gdb/main.c b/gdb/main.c
index ed2187afa1a..415b9005531 100644
--- a/gdb/main.c
+++ b/gdb/main.c
@@ -984,12 +984,7 @@ captured_main (void *data)
       error (_("Interpreter `%s' unrecognized"), interpreter_p);
     /* Install it.  */
     if (!interp_set (interp, 1))
-      {
-        fprintf_unfiltered (gdb_stderr,
-			    "Interpreter `%s' failed to initialize.\n",
-                            interpreter_p);
-        exit (1);
-      }
+      error (_("Interpreter `%s' failed to initialize."), interpreter_p);
   }
 
   /* FIXME: cagney/2003-02-03: The big hack (part 2 of 2) that lets