git.asbjorn.biz
/
debian
/
dhcpd-pools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
make range allocation dynamic
[debian/dhcpd-pools.git]
/
src
/
other.c
diff --git
a/src/other.c
b/src/other.c
index
d8f9ac4
..
21a763a
100644
(file)
--- a/
src/other.c
+++ b/
src/other.c
@@
-41,7
+41,6
@@
extern char *malloc();
void *safe_malloc(const size_t size)
{
void *ret = malloc(size);
void *safe_malloc(const size_t size)
{
void *ret = malloc(size);
-
if (ret == NULL) {
err(EXIT_FAILURE,
"safe_malloc: cannot allocate %lu bytes: ", size);
if (ret == NULL) {
err(EXIT_FAILURE,
"safe_malloc: cannot allocate %lu bytes: ", size);
@@
-50,6
+49,17
@@
void *safe_malloc(const size_t size)
return ret;
}
return ret;
}
+/* Simple memory reallocation wrapper */
+void *safe_realloc(void *ptr, const size_t size)
+{
+ void *ret = realloc(ptr, size);
+
+ if (!ret && size)
+ err(EXIT_FAILURE,
+ "safe_realloc: cannot allocate %zu bytes", size);
+ return ret;
+}
+
/* Simple strdup wrapper */
char *safe_strdup(const char *str)
{
/* Simple strdup wrapper */
char *safe_strdup(const char *str)
{
@@
-108,7
+118,7
@@
void print_version(void)
"This is free software: you are free to change and redistribute it.\n");
fprintf(stdout,
"There is NO WARRANTY, to the extent permitted by law.\n");
"This is free software: you are free to change and redistribute it.\n");
fprintf(stdout,
"There is NO WARRANTY, to the extent permitted by law.\n");
- exit(EXIT_SUCCESS);
+ exit(EXIT_SUCCESS);
}
void usage(int status)
}
void usage(int status)