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

Replace hardwired error handler in go32_create_inferior

go32_create_inferior invokes a hardwired fprintf/exit error handler
if v2loadimage fails.  I could find no reason for this other than that
the block seems to have been copy-and-pasted from v2loadimage's
manpage.  This commit replaces the hardwired handler with a call to
error.

gdb/ChangeLog:

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 889896278bb..dd5e080a679 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-29  Gary Benson  <gbenson@redhat.com>
+
+	* go32-nat.c (go32_create_inferior): Replace a fprintf/
+	exit pair with a call to error.  Wrap the message with _().
+
 2014-08-29  Gary Benson  <gbenson@redhat.com>
 
 	* main.c (captured_main): Replace a fprintf/exit
diff --git a/gdb/go32-nat.c b/gdb/go32-nat.c
index 727f810aa51..ed542478f5e 100644
--- a/gdb/go32-nat.c
+++ b/gdb/go32-nat.c
@@ -638,6 +638,7 @@ go32_create_inferior (struct target_ops *ops, char *exec_file,
   char **env_save = environ;
   size_t cmdlen;
   struct inferior *inf;
+  int result;
 
   /* If no exec file handed to us, get it from the exec-file command -- with
      a good, common error message if none is specified.  */
@@ -689,15 +690,14 @@ go32_create_inferior (struct target_ops *ops, char *exec_file,
 
   environ = env;
 
-  if (v2loadimage (exec_file, cmdline, start_state))
-    {
-      environ = env_save;
-      printf_unfiltered ("Load failed for image %s\n", exec_file);
-      exit (1);
-    }
+  result = v2loadimage (exec_file, cmdline, start_state);
+
   environ = env_save;
   xfree (cmdline);
 
+  if (result != 0)
+    error (_("Load failed for image %s", exec_file);
+
   edi_init (start_state);
 #if __DJGPP_MINOR__ < 3
   save_npx ();