From: "Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH/RFC v7 1/2] Add infrastructure for translating Git with gettext
Date: Sat, 5 Jun 2010 14:10:21 +0000 [thread overview]
Message-ID: <AANLkTim3PcoLrYb46Bh3tK7Ir3v-K0EQ0czPaD5DIIOK@mail.gmail.com> (raw)
In-Reply-To: <20100605033849.GB2252@progeny.tock>
On Sat, Jun 5, 2010 at 03:38, Jonathan Nieder <jrnieder@gmail.com> wrote:
> Ævar Arnfjörð Bjarmason wrote:
>> On Sat, Jun 5, 2010 at 03:01, Jonathan Nieder <jrnieder@gmail.com> wrote:
>
>>> #ifdef NO_GETTEXT
>>> static inline void git_setup_gettext(void) {}
>>> #endif
>>>
>>> and
>>>
>>> ifndef NO_GETTEXT
>>> LIB_OBJS += gettext.o
>>> endif
>>
>> Sure, but that would be putting code in a header file, which is
>> usually taboo. It looks like there's some prior art on that though.
>> Like strbuf.h.
>>
>> I don't care either way, what do you think?
>
> This is what ‘inline’ is for. I think using it for stubs like this
> is perfectly acceptable and improves readability.
Great. I've fixed this in my local copy. Now I don't compile gettext.c
when NO_GETTEXT is set, and it'll be defined as static inline in the
header file.
It'll become part of the next patch. Here's the diff:
diff --git a/Makefile b/Makefile
index 3040000..e21f7f0 100644
--- a/Makefile
+++ b/Makefile
@@ -578,7 +578,9 @@ LIB_OBJS += entry.o
LIB_OBJS += environment.o
LIB_OBJS += exec_cmd.o
LIB_OBJS += fsck.o
+ifndef NO_GETTEXT
LIB_OBJS += gettext.o
+endif
LIB_OBJS += graph.o
LIB_OBJS += grep.o
LIB_OBJS += hash.o
diff --git a/gettext.c b/gettext.c
index 22cdcc1..4825799 100644
--- a/gettext.c
+++ b/gettext.c
@@ -1,11 +1,8 @@
-#ifdef NO_GETTEXT
-void git_setup_gettext(void) {}
-#else
#include "exec_cmd.h"
#include <libintl.h>
#include <stdlib.h>
-void git_setup_gettext(void) {
+inline void git_setup_gettext(void) {
char *podir;
char *envdir = getenv("GIT_TEXTDOMAINDIR");
@@ -22,4 +19,3 @@ void git_setup_gettext(void) {
(void)setlocale(LC_CTYPE, "");
(void)textdomain("git");
}
-#endif
diff --git a/gettext.h b/gettext.h
index a99da6a..8d44808 100644
--- a/gettext.h
+++ b/gettext.h
@@ -1,7 +1,11 @@
#ifndef GETTEXT_H
#define GETTEXT_H
-void git_setup_gettext(void);
+#ifdef NO_GETTEXT
+static inline void git_setup_gettext(void) {}
+#else
+inline void git_setup_gettext(void);
+#endif
#ifdef NO_GETTEXT
#define _(s) (s)
next prev parent reply other threads:[~2010-06-05 14:10 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-05 2:13 [PATCH/RFC v7 0/2] Add infrastructure for translating Git with gettext Ævar Arnfjörð Bjarmason
2010-06-05 2:13 ` [PATCH/RFC v7 1/2] " Ævar Arnfjörð Bjarmason
2010-06-05 2:57 ` Jonathan Nieder
2010-06-05 3:28 ` Ævar Arnfjörð Bjarmason
2010-06-05 3:36 ` Jonathan Nieder
2010-06-05 15:19 ` Ævar Arnfjörð Bjarmason
2010-06-05 19:27 ` Jonathan Nieder
2010-06-05 19:47 ` Ævar Arnfjörð Bjarmason
2010-06-12 17:26 ` Jonathan Nieder
2010-06-05 3:01 ` Jonathan Nieder
2010-06-05 3:30 ` Ævar Arnfjörð Bjarmason
2010-06-05 3:38 ` Jonathan Nieder
2010-06-05 14:10 ` Ævar Arnfjörð Bjarmason [this message]
2010-06-05 18:59 ` Jonathan Nieder
2010-06-05 19:33 ` Ævar Arnfjörð Bjarmason
2010-06-05 20:16 ` Inline functions (Re: [PATCH/RFC v7 1/2] Add infrastructure for translating Git with gettext) Jonathan Nieder
2010-06-05 13:57 ` [PATCH/RFC v7 1/2] Add infrastructure for translating Git with gettext Jakub Narebski
2010-06-05 16:19 ` Ævar Arnfjörð Bjarmason
2010-06-05 2:13 ` [PATCH/RFC v7 2/2] Add initial C, Shell and Perl gettext translations Ævar Arnfjörð Bjarmason
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=AANLkTim3PcoLrYb46Bh3tK7Ir3v-K0EQ0czPaD5DIIOK@mail.gmail.com \
--to=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).