From: Nick Clifton <nickc@redhat.com>
Date: Thu, 30 Oct 2014 09:53:56 +0000 (+0000)
Subject: Fix error message strings so that they can be translated properly.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=76ca31c09f629e670ffd57e79c0604db7ddecc9e;p=binutils-gdb.git

Fix error message strings so that they can be translated properly.

	* readelf.c (CHECK_ENTSIZE_VALUES): Rewrite error message so that
	there is a single string for translation.
	(dynamic_section_mips_val): Likewise.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 5b2fa64fb86..025f4068fcd 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-30  Nick Clifton  <nickc@redhat.com>
+
+	* readelf.c (CHECK_ENTSIZE_VALUES): Rewrite error message so that
+	there is a single string for translation.
+	(dynamic_section_mips_val): Likewise.
+
 2014-10-29  Nick Clifton  <nickc@redhat.com>
 
 	* po/bg.po: Updated Bulgarian translation.
diff --git a/binutils/readelf.c b/binutils/readelf.c
index bc79f036f5a..aea02623c22 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -5054,19 +5054,22 @@ process_section_headers (FILE * file)
       break;
     }
 
-#define CHECK_ENTSIZE_VALUES(section, i, size32, size64) \
-  do									    \
-    {									    \
-      bfd_size_type expected_entsize = is_32bit_elf ? size32 : size64;	    \
-      if (section->sh_entsize != expected_entsize)			    \
+#define CHECK_ENTSIZE_VALUES(section, i, size32, size64)		\
+  do									\
+    {									\
+      bfd_size_type expected_entsize = is_32bit_elf ? size32 : size64;	\
+      if (section->sh_entsize != expected_entsize)			\
 	{								\
-	  error (_("Section %d has invalid sh_entsize of %" BFD_VMA_FMT "x\n"), \
-		 i, section->sh_entsize);	\
-	  error (_("(Using the expected size of %d for the rest of this dump)\n"), \
-		   (int) expected_entsize); \
+	  char buf[40];							\
+	  sprintf_vma (buf, section->sh_entsize);			\
+	  /* Note: coded this way so that there is a single string for  \
+	     translation.  */ \
+	  error (_("Section %d has invalid sh_entsize of %s\n"), i, buf); \
+	  error (_("(Using the expected size of %u for the rest of this dump)\n"), \
+		   (unsigned) expected_entsize);			\
 	  section->sh_entsize = expected_entsize;			\
-	} \
-    }									    \
+	}								\
+    }									\
   while (0)
 
 #define CHECK_ENTSIZE(section, i, type)					\
@@ -7776,7 +7779,12 @@ dynamic_section_mips_val (Elf_Internal_Dyn * entry)
       if (VALID_DYNAMIC_NAME (entry->d_un.d_val))
 	printf (_("Interface Version: %s"), GET_DYNAMIC_NAME (entry->d_un.d_val));
       else
-	printf (_("<corrupt: %" BFD_VMA_FMT "d>"), entry->d_un.d_ptr);
+	{
+	  char buf[40];
+	  sprintf_vma (buf, entry->d_un.d_ptr);
+	  /* Note: coded this way so that there is a single string for translation.  */
+	  printf (_("<corrupt: %s>"), buf);
+	}
       break;
 
     case DT_MIPS_TIME_STAMP: