From: Tom Tromey <tom@tromey.com>
Date: Thu, 13 Sep 2018 22:33:27 +0000 (-0600)
Subject: Make variable in get_startup_shell non-static
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=87b240d48512fa30aab8b5963914a9093009fd68;p=deliverable%2Fbinutils-gdb.git

Make variable in get_startup_shell non-static

I noticed that a variable in get_startup_shell is "static".  However,
I couldn't see any reason it ought to be, so this removes the
"static".

gdb/ChangeLog
2018-09-14  Tom Tromey  <tom@tromey.com>

	* nat/fork-inferior.c (get_startup_shell): Remove "static".
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 931842bf9e..d83f087390 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2018-09-14  Tom Tromey  <tom@tromey.com>
+
+	* nat/fork-inferior.c (get_startup_shell): Remove "static".
+
 2018-09-13  Tom Tromey  <tom@tromey.com>
 
 	* python/py-inferior.c (infpy_thread_from_thread_handle): Now
diff --git a/gdb/nat/fork-inferior.c b/gdb/nat/fork-inferior.c
index ea71aad25f..40cd05a0f8 100644
--- a/gdb/nat/fork-inferior.c
+++ b/gdb/nat/fork-inferior.c
@@ -272,9 +272,7 @@ execv_argv::init_for_shell (const char *exec_file,
 static const char *
 get_startup_shell ()
 {
-  static const char *ret;
-
-  ret = getenv ("SHELL");
+  const char *ret = getenv ("SHELL");
   if (ret == NULL)
     ret = SHELL_FILE;