diff options
Diffstat (limited to 'xmalloc.c')
| -rw-r--r-- | xmalloc.c | 26 |
1 files changed, 19 insertions, 7 deletions
@@ -16,10 +16,9 @@ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -#include <sys/param.h> +#include <sys/types.h> -#include <errno.h> -#include <libgen.h> +#include <stdint.h> #include <stdlib.h> #include <string.h> @@ -67,7 +66,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; @@ -77,12 +89,12 @@ 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); } -int printflike2 +int xasprintf(char **ret, const char *fmt, ...) { va_list ap; @@ -107,7 +119,7 @@ xvasprintf(char **ret, const char *fmt, va_list ap) return (i); } -int printflike3 +int xsnprintf(char *buf, size_t len, const char *fmt, ...) { va_list ap; |