@matheusbsbs / matheus-bagliano / commits / 153fb49e60

gettext: remove optional non-standard parens in N_() definition

Remove the USE_PARENS_AROUND_GETTEXT_N compile-time option which was meant to catch an inadvertent mistake which is too obscure to maintain this facility. The backstory of how USE_PARENS_AROUND_GETTEXT_N came about is: When I added the N_() macro in 65784830366 (i18n: add no-op _() and N_() wrappers, 2011-02-22) it was defined as: #define N_(msgid) (msgid) This is non-standard C, as was noticed and fixed in 642f85faab2 (i18n: avoid parenthesized string as array initializer, 2011-04-07). I.e. this needed to be defined as: #define N_(msgid) msgid Then in e62cd35a3e8 (i18n: log: mark parseopt strings for translation, 2012-08-20) when "builtin_log_usage" was marked for translation the string concatenation for passing to usage() added in 1c370ea4e51 (Show usage string for 'git log -h', 'git show -h' and 'git diff -h', 2009-08-06) was faithfully preserved: - "git log [<options>] [<since>..<until>] [[--] <path>...]\n" - " or: git show [options] <object>...", + N_("git log [<options>] [<since>..<until>] [[--] <path>...]\n") + N_(" or: git show [options] <object>..."), This was then fixed to be the expected array of usage strings in e66dc0cc4b1 (log.c: fix translation markings, 2015-01-06) rather than a string with multiple "\n"-delimited usage strings, and finally in 290c8e7a3fe (gettext.h: add parentheses around N_ expansion if supported, 2015-01-11) USE_PARENS_AROUND_GETTEXT_N was added to ensure this mistake didn't happen again. I think that even if this was a N_()-specific issue this USE_PARENS_AROUND_GETTEXT_N facility wouldn't be worth it, the issue would be too rare to worry about. But I also think that 290c8e7a3fe which introduced USE_PARENS_AROUND_GETTEXT_N misattributed the problem. The issue wasn't with the N_() macro added in e62cd35a3e8, but that before the N_() macro existed in the codebase the initial migration to parse_options() in 1c370ea4e51 continued passsing in a "\n"-delimited string, when the new API it was migrating to supported and expected the passing of an array. Helped-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Ævar Arnfjörð Bjarmason committed Sep 3, 2021 at 10:02 UTC 153fb49e6083aed48da0b035ffdcf35c7b6eea0a
4 files changed +1 -49
Makefile
+1 -19
@@ -409,15 +409,6 @@ all::
409 # Define NEEDS_LIBRT if your platform requires linking with librt (glibc version
410 # before 2.17) for clock_gettime and CLOCK_MONOTONIC.
411 #
412 -# Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
413 -# compiles the following initialization:
414 -#
415 -# static const char s[] = ("FOO");
416 -#
417 -# and define it to "no" if you need to remove the parentheses () around the
418 -# constant. The default is "auto", which means to use parentheses if your
419 -# compiler is detected to support it.
420 -#
412 # Define HAVE_BSD_SYSCTL if your platform has a BSD-compatible sysctl function.
413 #
414 # Define HAVE_GETDELIM if your system has the getdelim() function.
@@ -497,8 +488,7 @@ all::
488 #
489 # pedantic:
490 #
500 -# Enable -pedantic compilation. This also disables
501 -# USE_PARENS_AROUND_GETTEXT_N to produce only relevant warnings.
491 +# Enable -pedantic compilation.
492
493 GIT-VERSION-FILE: FORCE
494 @$(SHELL_PATH) ./GIT-VERSION-GEN
@@ -1347,14 +1337,6 @@ ifneq (,$(SOCKLEN_T))
1337 BASIC_CFLAGS += -Dsocklen_t=$(SOCKLEN_T)
1338 endif
1339
1350 -ifeq (yes,$(USE_PARENS_AROUND_GETTEXT_N))
1351 - BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=1
1352 -else
1353 -ifeq (no,$(USE_PARENS_AROUND_GETTEXT_N))
1354 - BASIC_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
1355 -endif
1356 -endif
1357 -
1340 ifeq ($(uname_S),Darwin)
1341 ifndef NO_FINK
1342 ifeq ($(shell test -d /sw/lib && echo y),y)
config.mak.dev
-2
@@ -4,8 +4,6 @@ SPARSE_FLAGS += -Wsparse-error
4 endif
5 ifneq ($(filter pedantic,$(DEVOPTS)),)
6 DEVELOPER_CFLAGS += -pedantic
7 -# don't warn for each N_ use
8 -DEVELOPER_CFLAGS += -DUSE_PARENS_AROUND_GETTEXT_N=0
7 endif
8 DEVELOPER_CFLAGS += -Wall
9 DEVELOPER_CFLAGS += -Wdeclaration-after-statement
gettext.h
-24
@@ -55,31 +55,7 @@ const char *Q_(const char *msgid, const char *plu, unsigned long n)
55 }
56
57 /* Mark msgid for translation but do not translate it. */
58 -#if !USE_PARENS_AROUND_GETTEXT_N
58 #define N_(msgid) msgid
60 -#else
61 -/*
62 - * Strictly speaking, this will lead to invalid C when
63 - * used this way:
64 - * static const char s[] = N_("FOO");
65 - * which will expand to
66 - * static const char s[] = ("FOO");
67 - * and in valid C, the initializer on the right hand side must
68 - * be without the parentheses. But many compilers do accept it
69 - * as a language extension and it will allow us to catch mistakes
70 - * like:
71 - * static const char *msgs[] = {
72 - * N_("one")
73 - * N_("two"),
74 - * N_("three"),
75 - * NULL
76 - * };
77 - * (notice the missing comma on one of the lines) by forcing
78 - * a compilation error, because parenthesised ("one") ("two")
79 - * will not get silently turned into ("onetwo").
80 - */
81 -#define N_(msgid) (msgid)
82 -#endif
59
60 const char *get_preferred_languages(void);
61 int is_utf8_locale(void);
git-compat-util.h
-4
@@ -1253,10 +1253,6 @@ int warn_on_fopen_errors(const char *path);
1253 */
1254 int open_nofollow(const char *path, int flags);
1255
1256 -#if !defined(USE_PARENS_AROUND_GETTEXT_N) && defined(__GNUC__)
1257 -#define USE_PARENS_AROUND_GETTEXT_N 1
1258 -#endif
1259 -
1256 #ifndef SHELL_PATH
1257 # define SHELL_PATH "/bin/sh"
1258 #endif