Replace a few leftover calls to strdup and calloc with xstrdup and xcalloc

respectively.

ok okan.

5 files changed, 16 insertions, 21 deletions

diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 16706c47c..ae05a0f9b 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -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.h,v 1.34 2008/04/16 13:35:37 oga Exp $
+ * $Id: calmwm.h,v 1.35 2008/04/16 13:38:09 oga Exp $
  */
 
 #ifndef _CALMWM_H_
@@ -409,11 +409,11 @@ void			 grab_label(struct client_ctx *);
 
 void			 xfree(void *);
 void			*xmalloc(size_t);
-void			*xcalloc(size_t);
+void			*xcalloc(size_t, size_t);
 char			*xstrdup(const char *);
 
 #define XMALLOC(p, t) ((p) = (t *)xmalloc(sizeof * (p)))
-#define XCALLOC(p, t) ((p) = (t *)xcalloc(sizeof * (p)))
+#define XCALLOC(p, t) ((p) = (t *)xcalloc(1, sizeof * (p)))
 
 void			 screen_init(void);
 struct screen_ctx	*screen_fromroot(Window);
diff --git a/app/cwm/conf.c b/app/cwm/conf.c
index dc2b58887..8ae68e961 100644
--- a/app/cwm/conf.c
+++ b/app/cwm/conf.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: conf.c,v 1.26 2008/04/15 20:24:41 oga Exp $
+ * $Id: conf.c,v 1.27 2008/04/16 13:38:09 oga Exp $
  */
 
 #include "headers.h"
@@ -360,7 +360,7 @@ conf_bindname(struct conf *c, char *name, char *binding)
 		return;
 
 	current_binding->callback = kbfunc_cmdexec;
-	current_binding->argument = strdup(binding);
+	current_binding->argument = xstrdup(binding);
 	current_binding->flags = 0;
 	TAILQ_INSERT_TAIL(&c->keybindingq, current_binding, entry);
 	return;
diff --git a/app/cwm/group.c b/app/cwm/group.c
index 24cf337c8..406eaf13a 100644
--- a/app/cwm/group.c
+++ b/app/cwm/group.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: group.c,v 1.10 2008/04/16 13:35:37 oga Exp $
+ * $Id: group.c,v 1.11 2008/04/16 13:38:09 oga Exp $
  */
 
 #include "headers.h"
@@ -85,7 +85,7 @@ _group_show(struct group_ctx *gc)
 	u_int i;
 	int lastempty = -1;
 
-	winlist = (Window *) xcalloc(sizeof(*winlist) * (gc->highstack + 1));
+	winlist = (Window *) xcalloc(sizeof(*winlist), (gc->highstack + 1));
 
 	/*
 	 * Invert the stacking order as XRestackWindows() expects them
diff --git a/app/cwm/parse.y b/app/cwm/parse.y
index a218642ea..a6fe7fa76 100644
--- a/app/cwm/parse.y
+++ b/app/cwm/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.4 2008/04/15 20:24:41 oga Exp $ */
+/*	$OpenBSD: parse.y,v 1.5 2008/04/16 13:38:09 oga Exp $ */
 
 /*
  * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -359,9 +359,7 @@ yylex(void)
 			}
 			*p++ = (char)c;
 		}
-		yylval.v.string = strdup(buf);
-		if (yylval.v.string == NULL)
-			err(1, "yylex: strdup");
+		yylval.v.string = xstrdup(buf);
 		return (STRING);
 	}
 
@@ -418,8 +416,7 @@ nodigits:
 		lungetc(c);
 		*p = '\0';
 		if ((token = lookup(buf)) == STRING)
-			if ((yylval.v.string = strdup(buf)) == NULL)
-				err(1, "yylex: strdup");
+			yylval.v.string = xstrdup(buf);
 		return (token);
 	}
 	if (c == '\n') {
@@ -436,11 +433,9 @@ pushfile(const char *name)
 {
 	struct file	*nfile;
 
-	if ((nfile = calloc(1, sizeof(struct file))) == NULL ||
-	    (nfile->name = strdup(name)) == NULL) {
-		warn("malloc");
-		return (NULL);
-	}
+	nfile = xcalloc(1, sizeof(struct file));
+	nfile->name = xstrdup(name);
+
 	if ((nfile->stream = fopen(nfile->name, "r")) == NULL) {
 		warn("%s", nfile->name);
 		free(nfile->name);
diff --git a/app/cwm/xmalloc.c b/app/cwm/xmalloc.c
index 7d763c330..e454c24b7 100644
--- a/app/cwm/xmalloc.c
+++ b/app/cwm/xmalloc.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: xmalloc.c,v 1.2 2008/01/11 16:06:44 oga Exp $
+ * $Id: xmalloc.c,v 1.3 2008/04/16 13:38:09 oga Exp $
  */
 
 #include "headers.h"
@@ -33,11 +33,11 @@ xmalloc(size_t siz)
 }
 
 void *
-xcalloc(size_t siz)
+xcalloc(size_t no, size_t siz)
 {
 	void *p;
 
-	if ((p = calloc(1, siz)) == NULL)
+	if ((p = calloc(no, siz)) == NULL)
 		err(1, "calloc");
 
 	return (p);