ryan/cwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
respectively.

ok okan.
This commit is contained in:
oga
2008-04-16 13:38:09 +00:00
parent f67772be65
commit f473dc3d12
5 changed files with 11 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
parse.y
View File

@@ -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);