summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPang Yan Han <pangyanhan@gmail.com>2011-02-15 06:30:49 +0800
committerDan McGee <dan@archlinux.org>2011-02-15 16:23:36 -0600
commit62a2e45b12f746c098523782fb5889793ef59687 (patch)
tree1361eb3f1238d90a2d7aebbc670671a20b364e9d
parent30f338cce6ebcab5dc521f5effef4c6527e8a197 (diff)
downloadpacman-62a2e45b12f746c098523782fb5889793ef59687.tar.xz
Use CALLOC for _alpm_graph_new()
Change _alpm_graph_new() to use CALLOC to avoid explicit zeroing out of fields in pmgraph_t. Signed-off-by: Pang Yan Han <pangyanhan@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/graph.h13
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/libalpm/graph.h b/lib/libalpm/graph.h
index 69f65000..07986f66 100644
--- a/lib/libalpm/graph.h
+++ b/lib/libalpm/graph.h
@@ -21,8 +21,7 @@
#include <sys/types.h> /* off_t */
#include "alpm_list.h"
-#include "util.h" /* MALLOC() */
-#include "alpm.h"
+#include "util.h" /* CALLOC() */
struct __pmgraph_t {
char state; /* 0: untouched, -1: entered, other: leaving time */
@@ -38,15 +37,7 @@ static pmgraph_t *_alpm_graph_new(void)
{
pmgraph_t *graph = NULL;
- MALLOC(graph, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
-
- if(graph) {
- graph->state = 0;
- graph->data = NULL;
- graph->parent = NULL;
- graph->children = NULL;
- graph->childptr = NULL;
- }
+ CALLOC(graph, 1, sizeof(pmgraph_t), RET_ERR(PM_ERR_MEMORY, NULL));
return(graph);
}