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

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

diff --git a/calmwm.c b/calmwm.c
index c409d6b..e10a89d 100644
--- a/calmwm.c
+++ b/calmwm.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: calmwm.c,v 1.14 2008/04/03 13:58:57 simon Exp $
+ * $Id: calmwm.c,v 1.15 2008/04/15 18:22:08 okan Exp $
  */
 
 #include "headers.h"
@@ -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 c87d475..b40e5cd 100644
--- a/parse.y
+++ b/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.1 2008/03/23 15:09:21 simon Exp $ */
+/*	$OpenBSD: parse.y,v 1.2 2008/04/15 18:22:08 okan Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -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 v1.2.3-2-gb3c3