More pacman side cleanup

* Cleaned up more of the header #includes, and got rid of a lot of stuff
  that was due to trying to make it compile on BSD/Darwin/CYGWIN. We can
  add it later but lets keep it simple for now and do it in seperate files
  if possible later.
* Removed a lot of #define MACROS. Some were not even used, and others were
  only used a few times.

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

1 files changed, 7 insertions, 11 deletions

diff --git a/src/pacman/conf.c b/src/pacman/conf.c
index 8a438269..3409f8d3 100644
--- a/src/pacman/conf.c
+++ b/src/pacman/conf.c
@@ -24,21 +24,16 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <alpm.h>
-
 /* pacman */
 #include "conf.h"
-#include "pacman.h"
-#include "util.h"
-#include "log.h"
 
 config_t *config_new(void)
 {
-	config_t *config;
-
-	MALLOC(config, sizeof(config_t));
-
-	memset(config, 0, sizeof(config_t));
+	config_t *config = calloc(1, sizeof(config_t));
+	if(!config) {
+			fprintf(stderr, "malloc failure: could not allocate %d bytes\n",
+			        sizeof(config_t));
+	}
 
 	return(config);
 }
@@ -49,8 +44,9 @@ int config_free(config_t *config)
 		return(-1);
 	}
 
-	FREE(config->configfile);
+	free(config->configfile);
 	free(config);
+	config = NULL;
 
 	return(0);
 }