Remove more unnecessary stuff

* Remove libintl.h from most files, as we only need to include it once in
  util.h where _() is defined.
* Remove other unnecessary header inclusions.
* Remove a macro that was only used once and replaced it with actual code.

Signed-off-by: Dan McGee <dan@archlinux.org>

src/pacman/add.c

@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <libintl.h>
 
 #include <alpm.h>
 #include <alpm_list.h>

src/pacman/conf.c

@@ -23,9 +23,6 @@
 
 #include <stdlib.h>
 #include <stdio.h>
-#include <string.h>
-#include <limits.h>
-#include <libintl.h>
 
 #include <alpm.h>
 

src/pacman/conf.h

@@ -56,8 +56,6 @@ typedef struct __config_t {
 	unsigned int ask;
 } config_t;
 
-#define FREECONF(p) do { if(p) { config_free(p); p = NULL; } } while(0)
-
 config_t *config_new(void);
 int config_free(config_t *config);
 

src/pacman/deptest.c

@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <libintl.h>
 
 #include <alpm.h>
 #include <alpm_list.h>

src/pacman/downloadprog.c

@@ -21,15 +21,10 @@
 
 #include "config.h"
 
-#include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <time.h>
 #include <sys/time.h>
-#include <libintl.h>
 #include <math.h>
 
 #include <alpm.h>

src/pacman/log.c

@@ -26,7 +26,6 @@
 #include <stdarg.h>
 #include <ctype.h>
 #include <time.h>
-#include <libintl.h>
 
 #include <alpm.h>
 

src/pacman/package.c

@@ -26,7 +26,6 @@
 #include <string.h>
 #include <limits.h>
 #include <sys/stat.h>
-#include <libintl.h>
 
 #include <alpm.h>
 #include <alpm_list.h>

src/pacman/pacman.c

@@ -233,7 +233,10 @@ static void cleanup(int signum)
 
 	/* free memory */
 	FREELIST(pm_targets);
-	FREECONF(config);
+	if(config) {
+		config_free(config);
+		config = NULL;
+	}
 
 	/* This fixes up any missing newlines (neednl) */
 	MSG(NL, "");

src/pacman/query.c

@@ -26,7 +26,6 @@
 #include <limits.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <libintl.h>
 #include <errno.h>
 #include <unistd.h>
 

src/pacman/remove.c

@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <libintl.h>
 
 #include <alpm.h>
 #include <alpm_list.h>

src/pacman/sync.c

@@ -30,7 +30,6 @@
 #endif
 #include <unistd.h>
 #include <dirent.h>
-#include <libintl.h>
 #ifdef CYGWIN
 #include <limits.h> /* PATH_MAX */
 #endif

src/pacman/trans.c

@@ -27,7 +27,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <dirent.h>
-#include <libintl.h>
 #include <wchar.h>
 
 #include <alpm.h>

src/pacman/util.c

@@ -37,7 +37,6 @@
 #include <ctype.h>
 #include <dirent.h>
 #include <unistd.h>
-#include <libintl.h>
 #ifdef CYGWIN
 #include <limits.h> /* PATH_MAX */
 #endif

src/pacman/util.h

@@ -23,7 +23,7 @@
 
 #include <stdlib.h>
 #include <string.h>
-#include <libintl.h>
+#include <libintl.h> /* here so it doesn't need to be included elsewhere */
 
 #include <alpm_list.h>
 
@@ -49,7 +49,9 @@
 /* update speed for the fill_progress based functions */
 #define UPDATE_SPEED_SEC 0.2f
 
+/* define _() as shortcut for gettext() */
 #define _(str) gettext(str)
+
 int getcols();
 int makepath(char *path);
 int rmrf(char *path);