From: Dmitry V. Levin <ldv@altlinux.org>
Date: Wed, 16 Dec 2020 08:00:00 +0000 (+0000)
Subject: libcpu: consistently use _(Str) instead of gettext(Str)
X-Git-Tag: elfutils-0.183~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e1174a5f2c4a1ceac39b3d91337de0e70b0c9fe7;p=thirdparty%2Felfutils.git

libcpu: consistently use _(Str) instead of gettext(Str)

eu-config.h defines _(Str) to dgettext ("elfutils", Str) instead of
a simple gettext (Str) for a reason: the library might be indirectly
used by clients that called bindtextdomain with a domain different
from "elfutils".

The change was made automatically using the following command:
$ git grep -l '\<gettext *(' libcpu |xargs sed -i 's/\<gettext *(/_(/g'

Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>
---

diff --git a/libcpu/ChangeLog b/libcpu/ChangeLog
index 000105bf9..781c8f414 100644
--- a/libcpu/ChangeLog
+++ b/libcpu/ChangeLog
@@ -1,3 +1,8 @@
+2020-12-16  Dmitry V. Levin  <ldv@altlinux.org>
+
+	* i386_lex.l (invalid_char): Replace gettext(...) with _(...).
+	* i386_parse.y (yyerror): Likewise.
+
 2020-12-12  Dmitry V. Levin  <ldv@altlinux.org>
 
 	* bpf_disasm.c (bswap_bpf_insn): Fix spelling typo in comment.
diff --git a/libcpu/i386_lex.l b/libcpu/i386_lex.l
index a4705aa99..b6ec0f870 100644
--- a/libcpu/i386_lex.l
+++ b/libcpu/i386_lex.l
@@ -119,8 +119,8 @@ static void
 invalid_char (int ch)
 {
   error (0, 0, (isascii (ch)
-		? gettext ("invalid character '%c' at line %d; ignored")
-		: gettext ("invalid character '\\%o' at line %d; ignored")),
+		? _("invalid character '%c' at line %d; ignored")
+		: _("invalid character '\\%o' at line %d; ignored")),
 	 ch, yylineno);
 }
 
diff --git a/libcpu/i386_parse.y b/libcpu/i386_parse.y
index 90c7bd934..9a92c2e0d 100644
--- a/libcpu/i386_parse.y
+++ b/libcpu/i386_parse.y
@@ -551,8 +551,8 @@ argcomp:	  kBITFIELD
 static void
 yyerror (const char *s)
 {
-  error (0, 0, gettext ("while reading i386 CPU description: %s at line %d"),
-         gettext (s), i386_lineno);
+  error (0, 0, _("while reading i386 CPU description: %s at line %d"),
+         _(s), i386_lineno);
 }