=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/lex/buf.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- src/usr.bin/lex/buf.c 2015/11/19 22:52:40 1.3 +++ src/usr.bin/lex/buf.c 2015/11/19 23:20:34 1.4 @@ -1,4 +1,4 @@ -/* $OpenBSD: buf.c,v 1.3 2015/11/19 22:52:40 tedu Exp $ */ +/* $OpenBSD: buf.c,v 1.4 2015/11/19 23:20:34 tedu Exp $ */ /* flex - tool to generate fast lexical analyzers */ @@ -78,12 +78,12 @@ char *t; size_t tsz; - t = flex_alloc(tsz = strlen(fmt) + strlen(s) + 1); + t = malloc(tsz = strlen(fmt) + strlen(s) + 1); if (!t) flexfatal(_("Allocation of buffer to print string failed")); snprintf(t, tsz, fmt, s); buf = buf_strappend(buf, t); - flex_free(t); + free(t); return buf; } @@ -100,7 +100,7 @@ char *dst, *t; size_t tsz; - t = flex_alloc(tsz = strlen("#line \"\"\n") + /* constant parts */ + t = malloc(tsz = strlen("#line \"\"\n") + /* constant parts */ 2 * strlen(filename) + /* filename with possibly all * backslashes escaped */ (int) (1 + log10(abs(lineno))) + /* line number */ @@ -114,7 +114,7 @@ *dst++ = '\n'; *dst = '\0'; buf = buf_strappend(buf, t); - flex_free(t); + free(t); return buf; } @@ -186,7 +186,7 @@ size_t strsz; val = val ? val : ""; - str = (char *) flex_alloc(strsz = strlen(fmt) + strlen(def) + strlen(val) + 2); + str = (char *) malloc(strsz = strlen(fmt) + strlen(def) + strlen(val) + 2); if (!str) flexfatal(_("Allocation of buffer for m4 def failed")); @@ -207,7 +207,7 @@ char *str; size_t strsz; - str = (char *) flex_alloc(strsz = strlen(fmt) + strlen(def) + 2); + str = (char *) malloc(strsz = strlen(fmt) + strlen(def) + 2); if (!str) flexfatal(_("Allocation of buffer for m4 undef failed")); @@ -234,7 +234,7 @@ struct Buf *buf; { if (buf && buf->elts) - flex_free(buf->elts); + free(buf->elts); buf->elts = (void *) 0; }