===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/yacc/skeleton.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- src/usr.bin/yacc/skeleton.c	2014/03/16 18:38:30	1.35
+++ src/usr.bin/yacc/skeleton.c	2015/12/28 19:14:04	1.36
@@ -1,4 +1,4 @@
-/*	$OpenBSD: skeleton.c,v 1.35 2014/03/16 18:38:30 guenther Exp $	*/
+/*	$OpenBSD: skeleton.c,v 1.36 2015/12/28 19:14:04 mmcc Exp $	*/
 /*	$NetBSD: skeleton.c,v 1.10 1996/03/25 00:36:18 mrg Exp $	*/
 
 /*
@@ -137,16 +137,14 @@
 	"#endif",
 	"    if (newsize && YY_SIZE_MAX / newsize < sizeof *newss)",
 	"        goto bail;",
-	"    newss = yyss ? (short *)realloc(yyss, newsize * sizeof *newss) :",
-	"      (short *)malloc(newsize * sizeof *newss); /* overflow check above */",
+	"    newss = realloc(yyss, newsize * sizeof(*newss)); /* overflow check above */",
 	"    if (newss == NULL)",
 	"        goto bail;",
 	"    yyss = newss;",
 	"    yyssp = newss + sslen;",
 	"    if (newsize && YY_SIZE_MAX / newsize < sizeof *newvs)",
 	"        goto bail;",
-	"    newvs = yyvs ? (YYSTYPE *)realloc(yyvs, newsize * sizeof *newvs) :",
-	"      (YYSTYPE *)malloc(newsize * sizeof *newvs); /* overflow check above */",
+	"    newvs = realloc(yyvs, newsize * sizeof(*newvs)); /* overflow check above */",
 	"    if (newvs == NULL)",
 	"        goto bail;",
 	"    yyvs = newvs;",
@@ -155,10 +153,8 @@
 	"    yysslim = yyss + newsize - 1;",
 	"    return 0;",
 	"bail:",
-	"    if (yyss)",
-	"            free(yyss);",
-	"    if (yyvs)",
-	"            free(yyvs);",
+	"    free(yyss);",
+	"    free(yyvs);",
 	"    yyss = yyssp = NULL;",
 	"    yyvs = yyvsp = NULL;",
 	"    yystacksize = 0;",
@@ -368,19 +364,15 @@
 	"yyoverflow:",
 	"    yyerror(\"yacc stack overflow\");",
 	"yyabort:",
-	"    if (yyss)",
-	"            free(yyss);",
-	"    if (yyvs)",
-	"            free(yyvs);",
+	"    free(yyss);",
+	"    free(yyvs);",
 	"    yyss = yyssp = NULL;",
 	"    yyvs = yyvsp = NULL;",
 	"    yystacksize = 0;",
 	"    return (1);",
 	"yyaccept:",
-	"    if (yyss)",
-	"            free(yyss);",
-	"    if (yyvs)",
-	"            free(yyvs);",
+	"    free(yyss);",
+	"    free(yyvs);",
 	"    yyss = yyssp = NULL;",
 	"    yyvs = yyvsp = NULL;",
 	"    yystacksize = 0;",