svn commit: r267675 - head/lib/libc/regex

[Pedro F. Giffuni]

Author: pfg
Date: Fri Jun 20 15:29:09 2014
New Revision: 267675
URL: http://svnweb.freebsd.org/changeset/base/267675

Log:
  regex: Make use of reallocf().
  
  Use of reallocf is useful in libraries as we are not certain the
  application will exit after NULL.
  
  This somewhat reduces portability but if since you are building
  this as part of libc it is likely you have our non-standard
  reallocf(3) already.
  
  Reviewed by:	ache
  MFC after:	5 days

Modified:
  head/lib/libc/regex/regcomp.c

Modified: head/lib/libc/regex/regcomp.c
==============================================================================
--- head/lib/libc/regex/regcomp.c	Fri Jun 20 13:26:49 2014	(r267674)
+++ head/lib/libc/regex/regcomp.c	Fri Jun 20 15:29:09 2014	(r267675)
@@ -1111,7 +1111,7 @@ allocset(struct parse *p)
 {
 	cset *cs, *ncs;
 
-	ncs = realloc(p->g->sets, (p->g->ncsets + 1) * sizeof(*ncs));
+	ncs = reallocf(p->g->sets, (p->g->ncsets + 1) * sizeof(*ncs));
 	if (ncs == NULL) {
 		SETERROR(REG_ESPACE);
 		return (NULL);
@@ -1174,7 +1174,7 @@ CHadd(struct parse *p, cset *cs, wint_t 
 	if (ch < NC)
 		cs->bmp[ch >> 3] |= 1 << (ch & 7);
 	else {
-		newwides = realloc(cs->wides, (cs->nwides + 1) *
+		newwides = reallocf(cs->wides, (cs->nwides + 1) *
 		    sizeof(*cs->wides));
 		if (newwides == NULL) {
 			SETERROR(REG_ESPACE);
@@ -1203,7 +1203,7 @@ CHaddrange(struct parse *p, cset *cs, wi
 		CHadd(p, cs, min);
 	if (min >= max)
 		return;
-	newranges = realloc(cs->ranges, (cs->nranges + 1) *
+	newranges = reallocf(cs->ranges, (cs->nranges + 1) *
 	    sizeof(*cs->ranges));
 	if (newranges == NULL) {
 		SETERROR(REG_ESPACE);
@@ -1227,7 +1227,7 @@ CHaddtype(struct parse *p, cset *cs, wct
 	for (i = 0; i < NC; i++)
 		if (iswctype(i, wct))
 			CHadd(p, cs, i);
-	newtypes = realloc(cs->types, (cs->ntypes + 1) *
+	newtypes = reallocf(cs->types, (cs->ntypes + 1) *
 	    sizeof(*cs->types));
 	if (newtypes == NULL) {
 		SETERROR(REG_ESPACE);
@@ -1350,7 +1350,7 @@ enlarge(struct parse *p, sopno size)
 	if (p->ssize >= size)
 		return 1;
 
-	sp = (sop *)realloc(p->strip, size*sizeof(sop));
+	sp = (sop *)reallocf(p->strip, size*sizeof(sop));
 	if (sp == NULL) {
 		SETERROR(REG_ESPACE);
 		return 0;
@@ -1368,7 +1368,7 @@ static void
 stripsnug(struct parse *p, struct re_guts *g)
 {
 	g->nstates = p->slen;
-	g->strip = (sop *)realloc((char *)p->strip, p->slen * sizeof(sop));
+	g->strip = (sop *)reallocf((char *)p->strip, p->slen * sizeof(sop));
 	if (g->strip == NULL) {
 		SETERROR(REG_ESPACE);
 		g->strip = p->strip;