From: Will Newton <will.newton@linaro.org>
Date: Fri, 4 Apr 2014 08:56:42 +0000 (+0100)
Subject: elf/dl-lookup.c: Remove unnecessary static variable
X-Git-Tag: glibc-2.20~276
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d6d062255489343810ad1e01d05f70acd9cd1918;p=thirdparty%2Fglibc.git

elf/dl-lookup.c: Remove unnecessary static variable

undefined_msg is only used once contrary to the comment.

ChangeLog:

2014-06-23  Will Newton  <will.newton@linaro.org>

	* elf/dl-lookup.c (undefined_msg): Remove variable.
	(_dl_lookup_symbol_x): Replace undefined_msg with string
	literal.
---

diff --git a/ChangeLog b/ChangeLog
index 4a2397ef38f..f86e3f03c71 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2014-06-23  Will Newton  <will.newton@linaro.org>
 
+	* elf/dl-lookup.c (undefined_msg): Remove variable.
+	(_dl_lookup_symbol_x): Replace undefined_msg with string
+	literal.
+
 	* elf/dl-lookup.c (do_lookup_unique): New function.
 	(do_lookup_x): Move STB_GNU_UNIQUE handling code
 	to a separate function.
diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c
index 896e1d27711..1c6ca8910c7 100644
--- a/elf/dl-lookup.c
+++ b/elf/dl-lookup.c
@@ -39,9 +39,6 @@
 
 #define VERSTAG(tag)	(DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (tag))
 
-/* We need this string more than once.  */
-static const char undefined_msg[] = "undefined symbol: ";
-
 
 struct sym_val
   {
@@ -817,7 +814,7 @@ _dl_lookup_symbol_x (const char *undef_name, struct link_map *undef_map,
 	  /* XXX We cannot translate the message.  */
 	  _dl_signal_cerror (0, DSO_FILENAME (reference_name),
 			     N_("symbol lookup error"),
-			     make_string (undefined_msg, undef_name,
+			     make_string ("undefined symbol: ", undef_name,
 					  versionstr, versionname));
 	}
       *ref = NULL;