[Findutils-patches] [PATCH 2/8] maint: Don't define the gettext-related macro N_ where it is not needed.

[James Youngman]

* lib/buildcmd.c: Don't define the macro N_(), since we don't use
it.
* lib/fdleak.c: Likewise.
* lib/safe-atoi.c: Likewise.
* lib/regextype.c: Likewise.
* lib/listfile.c: Likewise.
* locate/bigram.c: Likewise.
* locate/code.c: Likewise.
* locate/frcode.c: Likewise.
* locate/word_io.c: Likewise.
* find/fstype.c: Likewise.
* find/parser.c: Likewise.
* find/pred.c: Likewise.
* find/exec.c: Likewise.
* find/tree.c: Likewise.
* find/util.c: Likewise.
* find/print.c: Likewise.
* find/ftsfind.c: Likewise.
---
 find/exec.c      |  6 ------
 find/fstype.c    |  6 ------
 find/ftsfind.c   |  6 ------
 find/parser.c    |  6 ------
 find/pred.c      |  6 ------
 find/print.c     |  6 ------
 find/tree.c      |  6 ------
 find/util.c      |  6 ------
 lib/buildcmd.c   |  6 ------
 lib/fdleak.c     |  6 ------
 lib/listfile.c   |  6 ------
 lib/regextype.c  |  6 ------
 lib/safe-atoi.c  |  6 ------
 locate/bigram.c  |  6 ------
 locate/code.c    |  6 ------
 locate/frcode.c  | 12 ------------
 locate/word_io.c | 12 ------------
 17 files changed, 114 deletions(-)

diff --git a/find/exec.c b/find/exec.c
index 7b6ecf6..f8bd438 100644
--- a/find/exec.c
+++ b/find/exec.c
@@ -47,12 +47,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 /* Initialize exec->wd_for_exec.
diff --git a/find/fstype.c b/find/fstype.c
index a47b6d3..ddebac6 100644
--- a/find/fstype.c
+++ b/find/fstype.c
@@ -65,12 +65,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 static char *file_system_type_uncached (const struct stat *statp, const char 
*path);
 
diff --git a/find/ftsfind.c b/find/ftsfind.c
index 114b95b..cbb46de 100644
--- a/find/ftsfind.c
+++ b/find/ftsfind.c
@@ -68,12 +68,6 @@
 #define textdomain(Domain)
 #define bindtextdomain(Package, Directory)
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 /* FTS_TIGHT_CYCLE_CHECK tries to work around Savannah bug #17877
diff --git a/find/parser.c b/find/parser.c
index 7c75f2d..f186e4a 100644
--- a/find/parser.c
+++ b/find/parser.c
@@ -67,12 +67,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 #ifndef HAVE_ENDGRENT
 #define endgrent ()
diff --git a/find/pred.c b/find/pred.c
index 9d620cb..76683cc 100644
--- a/find/pred.c
+++ b/find/pred.c
@@ -60,12 +60,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 #ifdef CLOSEDIR_VOID
 /* Fake a return value. */
diff --git a/find/print.c b/find/print.c
index e4c28ad..75b1162 100644
--- a/find/print.c
+++ b/find/print.c
@@ -55,12 +55,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 #if defined STDC_HEADERS
 # define ISDIGIT(c) isdigit ((unsigned char)c)
diff --git a/find/tree.c b/find/tree.c
index 1ab6818..f83ad6c 100644
--- a/find/tree.c
+++ b/find/tree.c
@@ -38,12 +38,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 
diff --git a/find/util.c b/find/util.c
index ffca38d..cf7965f 100644
--- a/find/util.c
+++ b/find/util.c
@@ -51,12 +51,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 struct debug_option_assoc
diff --git a/lib/buildcmd.c b/lib/buildcmd.c
index a58f67e..3b5d226 100644
--- a/lib/buildcmd.c
+++ b/lib/buildcmd.c
@@ -49,12 +49,6 @@
 #define textdomain(Domain)
 #define bindtextdomain(Package, Directory)
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 /* COMPAT:  SYSV version defaults size (and has a max value of) to 470.
    We try to make it as large as possible.  See bc_get_arg_max() below. */
diff --git a/lib/fdleak.c b/lib/fdleak.c
index 2e6c9a9..c7ee611 100644
--- a/lib/fdleak.c
+++ b/lib/fdleak.c
@@ -49,12 +49,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 /* In order to detect FD leaks, we take a snapshot of the open
  * file descriptors which are not FD_CLOEXEC when the program starts.
diff --git a/lib/listfile.c b/lib/listfile.c
index 01a4ed7..4b7d4b2 100644
--- a/lib/listfile.c
+++ b/lib/listfile.c
@@ -72,12 +72,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 static bool print_name (register const char *p, FILE *stream, int 
literal_control_chars);
 
diff --git a/lib/regextype.c b/lib/regextype.c
index 352ffd4..735e10f 100644
--- a/lib/regextype.c
+++ b/lib/regextype.c
@@ -42,12 +42,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 struct tagRegexTypeMap
diff --git a/lib/safe-atoi.c b/lib/safe-atoi.c
index 45e64e9..4b5d9ae 100644
--- a/lib/safe-atoi.c
+++ b/lib/safe-atoi.c
@@ -36,12 +36,6 @@
 #else
 # define _(Text) Text
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 int
diff --git a/locate/bigram.c b/locate/bigram.c
index e83e9b1..675bf32 100644
--- a/locate/bigram.c
+++ b/locate/bigram.c
@@ -60,12 +60,6 @@
 #define textdomain(Domain)
 #define bindtextdomain(Package, Directory)
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop(String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 /* Return the length of the longest common prefix of strings S1 and S2. */
diff --git a/locate/code.c b/locate/code.c
index eae02ce..7068f64 100644
--- a/locate/code.c
+++ b/locate/code.c
@@ -74,12 +74,6 @@
 #define textdomain(Domain)
 #define bindtextdomain(Package, Directory)
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* See locate.c for explanation as to why not use (String) */
-# define N_(String) String
-#endif
 
 
 #ifndef ATTRIBUTE_NORETURN
diff --git a/locate/frcode.c b/locate/frcode.c
index 475b69a..c459839 100644
--- a/locate/frcode.c
+++ b/locate/frcode.c
@@ -96,18 +96,6 @@
 #define textdomain(Domain)
 #define bindtextdomain(Package, Directory)
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* We used to use (String) instead of just String, but apparently ISO C
- * doesn't allow this (at least, that's what HP said when someone reported
- * this as a compiler bug).  This is HP case number 1205608192.  See
- * also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11250 (which references
- * ANSI 3.5.7p14-15).  The Intel icc compiler also rejects constructs
- * like: static const char buf[] = ("string");
- */
-# define N_(String) String
-#endif
 
 
 /* Write out a 16-bit int, high byte first (network byte order).
diff --git a/locate/word_io.c b/locate/word_io.c
index 6e92f01..40a1890 100644
--- a/locate/word_io.c
+++ b/locate/word_io.c
@@ -43,18 +43,6 @@
 #define textdomain(Domain)
 #define bindtextdomain(Package, Directory)
 #endif
-#ifdef gettext_noop
-# define N_(String) gettext_noop (String)
-#else
-/* We used to use (String) instead of just String, but apparently ISO C
- * doesn't allow this (at least, that's what HP said when someone reported
- * this as a compiler bug).  This is HP case number 1205608192.  See
- * also http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11250 (which references
- * ANSI 3.5.7p14-15).  The Intel icc compiler also rejects constructs
- * like: static const char buf[] = ("string");
- */
-# define N_(String) String
-#endif
 
 
 enum { WORDBYTES=4 };
-- 
2.1.4