From 62a2e45b12f746c098523782fb5889793ef59687 Mon Sep 17 00:00:00 2001 From: Pang Yan Han Date: Tue, 15 Feb 2011 06:30:49 +0800 Subject: 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 Signed-off-by: Dan McGee --- lib/libalpm/graph.h | 13 ++----------- 1 file 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 /* 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); } -- cgit v1.2.3-55-g3dc8