debian: git-build-package config

[debian/dhcpd-pools.git] / src / other.c

diff --git a/src/other.c b/src/other.c
index 15bcdd2..4a9730b 100644 (file)
--- a/src/other.c
+++ b/src/other.c
@@ -1,19 +1,18 @@
-/*
-** Copyright (C) 2006- Sami Kerola <kerolasa@iki.fi>
-**  
-** This program is free software; you can redistribute it and/or modify
+/* http://dhcpd-pools.sourceforge.net/
+** Copyright 2006- Sami Kerola <kerolasa@iki.fi>
+**
+** This program is free software: you can redistribute it and/or modify
 ** it under the terms of the GNU General Public License as published by
-** the Free Software Foundation; either version 2 of the License, or
+** the Free Software Foundation, either version 3 of the License, or
 ** (at your option) any later version.
-** 
+**
 ** This program is distributed in the hope that it will be useful,
 ** but WITHOUT ANY WARRANTY; without even the implied warranty of
 ** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 ** GNU General Public License for more details.
-** 
+**
 ** You should have received a copy of the GNU General Public License
-** along with this program; if not, write to the Free Software 
-** Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+** along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #ifdef HAVE_CONFIG_H
@@ -42,7 +41,6 @@ extern char *malloc();
 void *safe_malloc(const size_t size)
 {
        void *ret = malloc(size);
-
        if (ret == NULL) {
                err(EXIT_FAILURE,
                    "safe_malloc: cannot allocate %lu bytes: ", size);
@@ -51,6 +49,27 @@ void *safe_malloc(const size_t size)
        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)
+{
+       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;
@@ -66,24 +85,22 @@ void flip_ranges(struct range_t *ranges, struct range_t *tmp_ranges)
 /* Free memory, flush buffers etc */
 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);
-       }
+       unsigned int i;
+
        /* Just in case there something in buffers */
-       ret = fflush(stdout);
-       if (errno || ret) {
-               warn("clean_up: stdout");
+       if (fflush(NULL)) {
+               warn("clean_up: fflush");
        }
-       ret = fflush(stderr);
-       if (errno || ret) {
-               warn("clean_up: stderr");
+       num_shared_networks++;
+       for (i = 0; i < num_shared_networks; i++) {
+               free((shared_networks + i)->name);
        }
        free(config.dhcpdconf_file);
        free(config.dhcpdlease_file);
        free(config.output_file);
        free(ranges);
-       free(shared_net_names);
+       free(leases);
+       free(touches);
        free(shared_networks);
 }
 
@@ -98,6 +115,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");
+       exit(EXIT_SUCCESS);
 }
 
 void usage(int status)