From 579efe92d1c484a6d8b9399b2abdb6440f9e92ea Mon Sep 17 00:00:00 2001
From: oga
Date: Wed, 16 Apr 2008 13:38:09 +0000
Subject: Replace a few leftover calls to strdup and calloc with xstrdup and
 xcalloc respectively.

ok okan.
---
 parse.y | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'parse.y')

diff --git a/parse.y b/parse.y
index a218642..a6fe7fa 100644
--- a/parse.y
+++ b/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);
-- 
cgit v1.2.3-2-gb3c3