[Frugalware-darcs] pacman: libalpm: drop the MALLOC macro

[VMiklos]

[libalpm: drop the MALLOC macro
VMiklos <vmiklos at frugalware.org>**20060208121114] {
hunk ./lib/libalpm/add.c 504
-							MALLOC(fn, strlen(file)+34);
+							if((fn = (char *)malloc(strlen(file)+34)) == NULL) {
+								RET_ERR(PM_ERR_MEMORY, -1);
+							}
hunk ./lib/libalpm/add.c 512
-							MALLOC(fn, strlen(file)+43);
+							if((fn = (char *)malloc(strlen(file)+43)) == NULL) {
+								RET_ERR(PM_ERR_MEMORY, -1);
+							}
hunk ./lib/libalpm/add.c 649
-							    MALLOC(fn, strlen(file)+34);
+							    if((fn = (char *)malloc(strlen(file)+34)) == NULL) {
+										RET_ERR(PM_ERR_MEMORY, -1);
+									}
hunk ./lib/libalpm/add.c 657
-							    MALLOC(fn, strlen(file)+43);
+							    if((fn = (char *)malloc(strlen(file)+43)) == NULL) {
+										RET_ERR(PM_ERR_MEMORY, -1);
+									}
hunk ./lib/libalpm/conflict.c 32
+#include "error.h"
hunk ./lib/libalpm/conflict.c 206
-						MALLOC(str, 512);
+						if((str = (char *)malloc(512)) == NULL) {
+							RET_ERR(PM_ERR_MEMORY, -1);
+						}
hunk ./lib/libalpm/conflict.c 296
-					MALLOC(str, 512);
+					if ((str = malloc(512)) == NULL) {
+						RET_ERR(PM_ERR_MEMORY, -1);
+					}
hunk ./lib/libalpm/db.c 35
+#include "error.h"
hunk ./lib/libalpm/db.c 52
-	MALLOC(db, sizeof(pmdb_t));
+	if((db = (pmdb_t *)malloc(sizeof(pmdb_t))) == NULL) {
+		RET_ERR(PM_ERR_MEMORY, -1);
+	}
hunk ./lib/libalpm/db.c 56
-	MALLOC(db->path, strlen(root)+strlen(dbpath)+strlen(treename)+2);
+	if((db->path = (char *)malloc(strlen(root)+strlen(dbpath)+strlen(treename)+2)) == NULL) {
+		RET_ERR(PM_ERR_MEMORY, -1);
+	}
hunk ./lib/libalpm/package.c 40
-	MALLOC(pkg, sizeof(pmpkg_t));
+	if((pkg = (pmpkg_t *)malloc(sizeof(pmpkg_t))) == NULL) {
+		RET_ERR(PM_ERR_MEMORY, -1);
+	}
hunk ./lib/libalpm/package.c 323
-			MALLOC(str, PATH_MAX);
+			if((str = (char *)malloc(PATH_MAX)) == NULL) {
+				RET_ERR(PM_ERR_MEMORY, -1);
+			}
hunk ./lib/libalpm/sync.c 724
-			MALLOC(ptr, 512);
+			if((ptr = (char *)malloc(512)) == NULL) {
+				RET_ERR(PM_ERR_MEMORY, -1);
+			}
hunk ./lib/libalpm/sync.c 736
-			MALLOC(ptr, 512);
+			if((ptr = (char *)malloc(512)) == NULL) {
+				RET_ERR(PM_ERR_MEMORY, -1);
+			}
hunk ./lib/libalpm/sync.c 745
-			MALLOC(ptr, 512);
+			if((ptr = (char *)malloc(512)) == NULL) {
+				RET_ERR(PM_ERR_MEMORY, -1);
+			}
hunk ./lib/libalpm/util.h 28
-#define MALLOC(p, b) { \
-	if((b) > 0) { \
-		p = malloc(b); \
-		if (!(p)) { \
-			fprintf(stderr, "malloc failure: could not allocate %d bytes\n", (b)); \
-			exit(1); \
-		} \
-	} else { \
-		p = NULL; \
-	} \
-}
}