Author: bapt
Date: Fri May 1 18:32:54 2015
New Revision: 282315
URL: https://svnweb.freebsd.org/changeset/base/282315
Log:
Remove bundled reallocarray(3) since it is now in libc
Modified:
head/usr.bin/m4/misc.c
Modified: head/usr.bin/m4/misc.c
==============================================================================
--- head/usr.bin/m4/misc.c Fri May 1 18:32:16 2015 (r282314)
+++ head/usr.bin/m4/misc.c Fri May 1 18:32:54 2015 (r282315)
@@ -64,8 +64,6 @@ unsigned char *bbase[MAXINP]; /* the ba
unsigned char *bp; /* first available character */
unsigned char *endpbb; /* end of push-back buffer */
-static void *reallocarray(void *, size_t, size_t);
-
/*
* find the index of second str in the first str.
*/
@@ -467,37 +465,3 @@ dump_buffer(FILE *f, size_t m)
for (s = bp; s-buf > (long)m;)
fputc(*--s, f);
}
-
-/* $OpenBSD: reallocarray.c,v 1.2 2014/12/08 03:45:00 bcook Exp $ */
-/*
- * Copyright (c) 2008 Otto Moerbeek <o...@drijf.net>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
- * This is sqrt(SIZE_MAX+1), as s1*s2 <= SIZE_MAX
- * if both s1 < MUL_NO_OVERFLOW and s2 < MUL_NO_OVERFLOW
- */
-#define MUL_NO_OVERFLOW ((size_t)1 << (sizeof(size_t) * 4))
-
-void *
-reallocarray(void *optr, size_t nmemb, size_t size)
-{
- if ((nmemb >= MUL_NO_OVERFLOW || size >= MUL_NO_OVERFLOW) &&
- nmemb > 0 && SIZE_MAX / nmemb < size) {
- errno = ENOMEM;
- return NULL;
- }
- return realloc(optr, size * nmemb);
-}
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
