Add xreallocarray and remove nmemb argument from xrealloc.

This commit is contained in:
nicm
2014-10-08 17:35:58 +00:00
parent 77efcf8bdd
commit a27ba6e380
17 changed files with 65 additions and 48 deletions

View File

@ -68,7 +68,20 @@ xmalloc(size_t size)
}
void *
xrealloc(void *oldptr, size_t nmemb, size_t size)
xrealloc(void *oldptr, size_t newsize)
{
void *newptr;
if (newsize == 0)
fatalx("zero size");
if ((newptr = realloc(oldptr, newsize)) == NULL)
fatal("xrealloc failed");
return (newptr);
}
void *
xreallocarray(void *oldptr, size_t nmemb, size_t size)
{
size_t newsize = nmemb * size;
void *newptr;
@ -78,7 +91,7 @@ xrealloc(void *oldptr, size_t nmemb, size_t size)
if (SIZE_MAX / nmemb < size)
fatalx("nmemb * size > SIZE_MAX");
if ((newptr = realloc(oldptr, newsize)) == NULL)
fatal("xrealloc failed");
fatal("xreallocarray failed");
return (newptr);
}