[apparmor] [patch 01/12] put the gettext define in one place

[john.johansen at canonical.com]

Signed-off-by: John Johansen <john.johansen at canonical.com>
Acked-by: Seth Arnold <seth.arnold at canonical.com>

---
 parser/dbus.cc            |    2 --
 parser/lib.c              |    1 -
 parser/parser.h           |    3 +++
 parser/parser_alias.c     |    2 --
 parser/parser_common.c    |    4 +---
 parser/parser_include.c   |    2 --
 parser/parser_interface.c |    7 -------
 parser/parser_lex.l       |    3 ---
 parser/parser_main.c      |    3 ---
 parser/parser_merge.c     |    2 --
 parser/parser_misc.c      |    2 --
 parser/parser_policy.c    |    2 --
 parser/parser_regex.c     |    2 --
 parser/parser_symtab.c    |    2 --
 parser/parser_variable.c  |    3 ---
 parser/parser_yacc.y      |    2 --
 16 files changed, 4 insertions(+), 38 deletions(-)

--- 2.9-test.orig/parser/dbus.cc
+++ 2.9-test/parser/dbus.cc
@@ -30,8 +30,6 @@
 #include "parser_yacc.h"
 #include "dbus.h"
 
-#define _(s) gettext(s)
-
 
 int parse_dbus_mode(const char *str_mode, int *mode, int fail)
 {
--- 2.9-test.orig/parser/lib.c
+++ 2.9-test/parser/lib.c
@@ -24,7 +24,6 @@
 #include <stddef.h>
 #include <stdlib.h>
 #include <unistd.h>
-#define _(s) gettext(s)
 
 #include <sys/stat.h>
 #include <sys/types.h>
--- 2.9-test.orig/parser/parser.h
+++ 2.9-test/parser/parser.h
@@ -28,6 +28,9 @@
 #include <netinet/in.h>
 #include <sys/resource.h>
 
+#include <libintl.h>
+#define _(s) gettext(s)
+
 #include "immunix.h"
 #include "libapparmor_re/apparmor_re.h"
 #include "libapparmor_re/aare_rules.h"
--- 2.9-test.orig/parser/parser_alias.c
+++ 2.9-test/parser/parser_alias.c
@@ -20,8 +20,6 @@
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
-#include <libintl.h>
-#define _(s) gettext(s)
 
 #include "immunix.h"
 #include "parser.h"
--- 2.9-test.orig/parser/parser_common.c
+++ 2.9-test/parser/parser_common.c
@@ -17,9 +17,7 @@
  */
 #include <stdlib.h>
 #include <stdarg.h>
-#include <libintl.h>
-#include <locale.h>
-#define _(s) gettext(s)
+
 #include "parser.h"
 
 /* Policy versioning is determined by a combination of 3 values:
--- 2.9-test.orig/parser/parser_include.c
+++ 2.9-test/parser/parser_include.c
@@ -44,11 +44,9 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
-#include <libintl.h>
 #include <dirent.h>
 #include "parser.h"
 #include "parser_include.h"
-#define _(s) gettext(s)
 
 /* An array of search directories, I sure hope 100's enough */
 #define MAX_PATH 100
--- 2.9-test.orig/parser/parser_interface.c
+++ 2.9-test/parser/parser_interface.c
@@ -24,8 +24,6 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <libintl.h>
-#define _(s) gettext(s)
 
 #include <string>
 #include <sstream>
@@ -37,11 +35,6 @@
 #include <unistd.h>
 #include <linux/unistd.h>
 
-#include <libintl.h>
-#define _(s) gettext(s)
-
-
-
 
 #define SD_CODE_SIZE (sizeof(u8))
 #define SD_STR_LEN (sizeof(u16))
--- 2.9-test.orig/parser/parser_lex.l
+++ 2.9-test/parser/parser_lex.l
@@ -29,7 +29,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <libintl.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -38,8 +37,6 @@
 #include <unordered_map>
 #include <string>
 
-#define _(s) gettext(s)
-
 #include "parser.h"
 #include "profile.h"
 #include "parser_include.h"
--- 2.9-test.orig/parser/parser_main.c
+++ 2.9-test/parser/parser_main.c
@@ -28,10 +28,7 @@
 #include <getopt.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <libintl.h>
-#include <locale.h>
 #include <dirent.h>
-#define _(s) gettext(s)
 
 /* enable the following line to get voluminous debug info */
 /* #define DEBUG */
--- 2.9-test.orig/parser/parser_merge.c
+++ 2.9-test/parser/parser_merge.c
@@ -21,8 +21,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <errno.h>
-#include <libintl.h>
-#define _(s) gettext(s)
 
 #include "parser.h"
 #include "profile.h"
--- 2.9-test.orig/parser/parser_misc.c
+++ 2.9-test/parser/parser_misc.c
@@ -26,8 +26,6 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <libintl.h>
-#define _(s) gettext(s)
 #include <netinet/in.h>
 #include <linux/socket.h>
 #include <linux/limits.h>
--- 2.9-test.orig/parser/parser_policy.c
+++ 2.9-test/parser/parser_policy.c
@@ -26,9 +26,7 @@
 #include <stdarg.h>
 #include <search.h>
 #include <string.h>
-#include <libintl.h>
 #include <errno.h>
-#define _(s) gettext(s)
 
 #include "parser.h"
 #include "profile.h"
--- 2.9-test.orig/parser/parser_regex.c
+++ 2.9-test/parser/parser_regex.c
@@ -19,10 +19,8 @@
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
-#include <libintl.h>
 #include <linux/limits.h>
 #include <sys/apparmor.h>
-#define _(s) gettext(s)
 
 #include <iomanip>
 #include <string>
--- 2.9-test.orig/parser/parser_symtab.c
+++ 2.9-test/parser/parser_symtab.c
@@ -20,9 +20,7 @@
 #include <stdarg.h>
 #include <string.h>
 #include <errno.h>
-#include <libintl.h>
 #include <linux/limits.h>
-#define _(s) gettext(s)
 
 #include "immunix.h"
 #include "parser.h"
--- 2.9-test.orig/parser/parser_variable.c
+++ 2.9-test/parser/parser_variable.c
@@ -21,13 +21,10 @@
 #include <stdio.h>
 #include <stdarg.h>
 #include <string.h>
-#include <libintl.h>
 #include <linux/limits.h>
 
 #include <string>
 
-#define _(s) gettext(s)
-
 /* #define DEBUG */
 
 #include "parser.h"
--- 2.9-test.orig/parser/parser_yacc.y
+++ 2.9-test/parser/parser_yacc.y
@@ -26,11 +26,9 @@
 #include <getopt.h>
 #include <errno.h>
 #include <fcntl.h>
-#include <libintl.h>
 #include <sys/apparmor.h>
 
 #include <iostream>
-#define _(s) gettext(s)
 
 /* #define DEBUG */