version 1.1.1.4, 2013/07/22 10:46:11
|
version 1.1.1.5, 2013/10/14 07:56:33
|
Line 49
|
Line 49
|
|
|
#include "missing.h" |
#include "missing.h" |
#include "alloc.h" |
#include "alloc.h" |
#include "error.h" | #include "fatal.h" |
#include "errno.h" | |
|
|
#define DEFAULT_TEXT_DOMAIN "sudo" |
#define DEFAULT_TEXT_DOMAIN "sudo" |
#include "gettext.h" |
#include "gettext.h" |
Line 82 emalloc(size_t size)
|
Line 81 emalloc(size_t size)
|
fatalx_nodebug(_("internal error, tried to emalloc(0)")); |
fatalx_nodebug(_("internal error, tried to emalloc(0)")); |
|
|
if ((ptr = malloc(size)) == NULL) |
if ((ptr = malloc(size)) == NULL) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
return ptr; |
return ptr; |
} |
} |
|
|
Line 102 emalloc2(size_t nmemb, size_t size)
|
Line 101 emalloc2(size_t nmemb, size_t size)
|
|
|
size *= nmemb; |
size *= nmemb; |
if ((ptr = malloc(size)) == NULL) |
if ((ptr = malloc(size)) == NULL) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
return ptr; |
return ptr; |
} |
} |
|
|
Line 124 ecalloc(size_t nmemb, size_t size)
|
Line 123 ecalloc(size_t nmemb, size_t size)
|
size *= nmemb; |
size *= nmemb; |
} |
} |
if ((ptr = malloc(size)) == NULL) |
if ((ptr = malloc(size)) == NULL) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
memset(ptr, 0, size); |
memset(ptr, 0, size); |
return ptr; |
return ptr; |
} |
} |
Line 143 erealloc(void *ptr, size_t size)
|
Line 142 erealloc(void *ptr, size_t size)
|
|
|
ptr = ptr ? realloc(ptr, size) : malloc(size); |
ptr = ptr ? realloc(ptr, size) : malloc(size); |
if (ptr == NULL) |
if (ptr == NULL) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
return ptr; |
return ptr; |
} |
} |
|
|
Line 165 erealloc3(void *ptr, size_t nmemb, size_t size)
|
Line 164 erealloc3(void *ptr, size_t nmemb, size_t size)
|
size *= nmemb; |
size *= nmemb; |
ptr = ptr ? realloc(ptr, size) : malloc(size); |
ptr = ptr ? realloc(ptr, size) : malloc(size); |
if (ptr == NULL) |
if (ptr == NULL) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
return ptr; |
return ptr; |
} |
} |
|
|
Line 189 erecalloc(void *ptr, size_t onmemb, size_t nmemb, size
|
Line 188 erecalloc(void *ptr, size_t onmemb, size_t nmemb, size
|
size = nmemb * msize; |
size = nmemb * msize; |
ptr = ptr ? realloc(ptr, size) : malloc(size); |
ptr = ptr ? realloc(ptr, size) : malloc(size); |
if (ptr == NULL) |
if (ptr == NULL) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
if (nmemb > onmemb) { |
if (nmemb > onmemb) { |
size = (nmemb - onmemb) * msize; |
size = (nmemb - onmemb) * msize; |
memset((char *)ptr + (onmemb * msize), 0, size); |
memset((char *)ptr + (onmemb * msize), 0, size); |
Line 254 easprintf(char **ret, const char *fmt, ...)
|
Line 253 easprintf(char **ret, const char *fmt, ...)
|
va_end(ap); |
va_end(ap); |
|
|
if (len == -1) |
if (len == -1) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
return len; |
return len; |
} |
} |
|
|
Line 268 evasprintf(char **ret, const char *format, va_list arg
|
Line 267 evasprintf(char **ret, const char *format, va_list arg
|
int len; |
int len; |
|
|
if ((len = vasprintf(ret, format, args)) == -1) |
if ((len = vasprintf(ret, format, args)) == -1) |
fatalx_nodebug(NULL); | fatal_nodebug(NULL); |
return len; |
return len; |
} |
} |