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
clean_up: checking errno at exit does not make sense
[debian/dhcpd-pools.git]
/
src
/
other.c
diff --git
a/src/other.c
b/src/other.c
index
4ad6b01
..
d8f9ac4
100644
(file)
--- a/
src/other.c
+++ b/
src/other.c
@@
-50,6
+50,16
@@
void *safe_malloc(const size_t size)
return ret;
}
return ret;
}
+/* Simple strdup wrapper */
+char *safe_strdup(const char *str)
+{
+ char *ret = strdup(str);
+
+ if (!ret && str)
+ err(EXIT_FAILURE, "cannot duplicate string");
+ return ret;
+}
+
void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
{
unsigned int i = num_ranges - 1, j;
void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
{
unsigned int i = num_ranges - 1, j;
@@
-66,9
+76,7
@@
void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
void clean_up(void)
{
int ret;
void clean_up(void)
{
int ret;
- if (errno) {
- warn("clean_up: errno (%d) set but not checked in correct place.\nif this is repeatable send strace output as a bug report", errno);
- }
+
/* Just in case there something in buffers */
ret = fflush(stdout);
if (errno || ret) {
/* Just in case there something in buffers */
ret = fflush(stdout);
if (errno || ret) {
@@
-78,10
+86,13
@@
void clean_up(void)
if (errno || ret) {
warn("clean_up: stderr");
}
if (errno || ret) {
warn("clean_up: stderr");
}
+
free(config.dhcpdconf_file);
free(config.dhcpdlease_file);
free(config.output_file);
free(ranges);
free(config.dhcpdconf_file);
free(config.dhcpdlease_file);
free(config.output_file);
free(ranges);
+ free(leases);
+ free(touches);
free(shared_net_names);
free(shared_networks);
}
free(shared_net_names);
free(shared_networks);
}
@@
-97,6
+108,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);
}
void usage(int status)
}
void usage(int status)