diff options
author | Yasuyuki KOZAKAI <yasuyuki@netfilter.org> | 2007-07-24 05:45:33 +0000 |
---|---|---|
committer | Yasuyuki KOZAKAI <yasuyuki@netfilter.org> | 2007-07-24 05:45:33 +0000 |
commit | 3dfa4488b032fc32aaf2470f48ac1fc3a534794f (patch) | |
tree | 52317cc3cc5562b3784b1a18e3d3e06ea09c1708 | |
parent | 5208806f2708f761e97e62550561e3164b541770 (diff) |
Moves common fw_malloc() and fw_calloc() to xtables.c
-rw-r--r-- | include/xtables.h | 3 | ||||
-rw-r--r-- | ip6tables.c | 25 | ||||
-rw-r--r-- | iptables.c | 25 | ||||
-rw-r--r-- | xtables.c | 30 |
4 files changed, 35 insertions, 48 deletions
diff --git a/include/xtables.h b/include/xtables.h index eed1dffc..6ef13fe1 100644 --- a/include/xtables.h +++ b/include/xtables.h @@ -1,4 +1,7 @@ #ifndef _XTABLES_H #define _XTABLES_H +extern void *fw_calloc(size_t count, size_t size); +extern void *fw_malloc(size_t size); + #endif /* _XTABLES_H */ diff --git a/ip6tables.c b/ip6tables.c index 6b2766b7..a096b795 100644 --- a/ip6tables.c +++ b/ip6tables.c @@ -36,6 +36,7 @@ #include <stdarg.h> #include <limits.h> #include <ip6tables.h> +#include <xtables.h> #include <arpa/inet.h> #include <unistd.h> #include <fcntl.h> @@ -494,30 +495,6 @@ check_inverse(const char option[], int *invert, int *optind, int argc) return FALSE; } -static void * -fw_calloc(size_t count, size_t size) -{ - void *p; - - if ((p = calloc(count, size)) == NULL) { - perror("ip6tables: calloc failed"); - exit(1); - } - return p; -} - -static void * -fw_malloc(size_t size) -{ - void *p; - - if ((p = malloc(size)) == NULL) { - perror("ip6tables: malloc failed"); - exit(1); - } - return p; -} - static char * addr_to_numeric(const struct in6_addr *addrp) { @@ -37,6 +37,7 @@ #include <limits.h> #include <unistd.h> #include <iptables.h> +#include <xtables.h> #include <fcntl.h> #include <sys/wait.h> #include <sys/utsname.h> @@ -579,30 +580,6 @@ check_inverse(const char option[], int *invert, int *optind, int argc) return FALSE; } -static void * -fw_calloc(size_t count, size_t size) -{ - void *p; - - if ((p = calloc(count, size)) == NULL) { - perror("iptables: calloc failed"); - exit(1); - } - return p; -} - -static void * -fw_malloc(size_t size) -{ - void *p; - - if ((p = malloc(size)) == NULL) { - perror("iptables: malloc failed"); - exit(1); - } - return p; -} - static struct in_addr * host_to_addr(const char *name, unsigned int *naddr) { @@ -16,4 +16,34 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + +#include <errno.h> +#include <stdio.h> +#include <stdlib.h> + +#include <iptables_common.h> #include <xtables.h> + +void *fw_calloc(size_t count, size_t size) +{ + void *p; + + if ((p = calloc(count, size)) == NULL) { + perror("ip[6]tables: calloc failed"); + exit(1); + } + + return p; +} + +void *fw_malloc(size_t size) +{ + void *p; + + if ((p = malloc(size)) == NULL) { + perror("ip[6]tables: malloc failed"); + exit(1); + } + + return p; +} |