libxtables: prefix/order - fw_xalloc
It is good practice to prefix names in a library some way so that
it does not clash with external programs' variable names right
on the first try.
This change: rename fw_[cm]alloc to xtables_[cm]alloc and
move the definition from internal.h to xtables.h to avoid
potential compiler warnings.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
diff --git a/iptables.c b/iptables.c
index 2b5a82e..8068cc8 100644
--- a/iptables.c
+++ b/iptables.c
@@ -932,7 +932,7 @@
for (matchp = matches; matchp; matchp = matchp->next)
size += IPT_ALIGN(sizeof(struct ipt_entry_match)) + matchp->match->size;
- mask = fw_calloc(1, size
+ mask = xtables_calloc(1, size
+ IPT_ALIGN(sizeof(struct ipt_entry_target))
+ xtables_targets->size);
@@ -998,7 +998,7 @@
chain = iptc_next_chain(handle);
}
- chains = fw_malloc(sizeof(ipt_chainlabel) * chaincount);
+ chains = xtables_malloc(sizeof(ipt_chainlabel) * chaincount);
i = 0;
chain = iptc_first_chain(handle);
while (chain) {
@@ -1370,7 +1370,7 @@
for (matchp = matches; matchp; matchp = matchp->next)
size += matchp->match->m->u.match_size;
- e = fw_malloc(size + target->u.target_size);
+ e = xtables_malloc(size + target->u.target_size);
*e = *fw;
e->target_offset = size;
e->next_offset = size + target->u.target_size;
@@ -1679,7 +1679,7 @@
size = IPT_ALIGN(sizeof(struct ipt_entry_target))
+ target->size;
- target->t = fw_calloc(1, size);
+ target->t = xtables_calloc(1, size);
target->t->u.target_size = size;
strcpy(target->t->u.user.name, jumpto);
set_revision(target->t->u.user.name,
@@ -1737,7 +1737,7 @@
m = find_match(optarg, LOAD_MUST_SUCCEED, &matches);
size = IPT_ALIGN(sizeof(struct ipt_entry_match))
+ m->size;
- m->m = fw_calloc(1, size);
+ m->m = xtables_calloc(1, size);
m->m->u.match_size = size;
strcpy(m->m->u.user.name, m->name);
set_revision(m->m->u.user.name, m->revision);
@@ -1891,7 +1891,7 @@
size = IPT_ALIGN(sizeof(struct ipt_entry_match))
+ m->size;
- m->m = fw_calloc(1, size);
+ m->m = xtables_calloc(1, size);
m->m->u.match_size = size;
strcpy(m->m->u.user.name, m->name);
set_revision(m->m->u.user.name,
@@ -2051,7 +2051,7 @@
size = sizeof(struct ipt_entry_target)
+ target->size;
- target->t = fw_calloc(1, size);
+ target->t = xtables_calloc(1, size);
target->t->u.target_size = size;
strcpy(target->t->u.user.name, jumpto);
if (!iptc_is_chain(jumpto, *handle))