From fe80d400634a3b5e38ad8d1e9b5a3146306305d2 Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Tue, 15 Apr 2008 18:22:08 +0000
Subject: malloc -> calloc

suggested by and ok oga@
---
 calmwm.c | 1 +
 parse.y  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/calmwm.c b/calmwm.c
index 9821b58..bfba638 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -81,6 +81,7 @@ main(int argc, char **argv)
 	group_init();
 
 	Starting = 1;
+	bzero(&Conf, sizeof(Conf));
 	conf_setup(&Conf, conffile);
 	client_setup();
 	x_setup(display_name);
diff --git a/parse.y b/parse.y
index bb5e44c..7322bbe 100644
--- a/parse.y
+++ b/parse.y
@@ -513,8 +513,7 @@ parse_config(const char *filename, struct conf *xconf)
 {
 	int			 errors = 0;
 
-	if ((conf = malloc(sizeof(struct conf))) == NULL)
-		return (-1);
+	XCALLOC(conf, struct conf);
 
 	if ((file = pushfile(filename)) == NULL) {
 		free(conf);
-- 
cgit 1.4.1