diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2009-02-01 21:38:14 +0100 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2009-02-01 21:38:14 +0100 |
commit | 43270796c709584b67343c333adaf28faea56265 (patch) | |
tree | 79b5f325011d8c441de3355daa379b7a0d368e83 /include | |
parent | ea268e19a8b820cce4bab3318e656efa51134487 (diff) |
libbxtables: prefix names and order it #1
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.
These functions are intended to fix Jamal's dependency problem in
his tc's ipt action.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/xtables.h.in | 3 | ||||
-rw-r--r-- | include/xtables/internal.h | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/include/xtables.h.in b/include/xtables.h.in index 8327c426..e63d171e 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -140,6 +140,9 @@ struct xtables_target #endif }; +extern void *xtables_calloc(size_t, size_t); +extern void *xtables_malloc(size_t); + /* Your shared library should call one of these. */ extern void xtables_register_match(struct xtables_match *me); extern void xtables_register_target(struct xtables_target *me); diff --git a/include/xtables/internal.h b/include/xtables/internal.h index 24a5078b..6b78d3a8 100644 --- a/include/xtables/internal.h +++ b/include/xtables/internal.h @@ -43,9 +43,6 @@ struct xtables_rule_match { extern char *lib_dir; -extern void *fw_calloc(size_t count, size_t size); -extern void *fw_malloc(size_t size); - extern const char *modprobe_program; extern int xtables_insmod(const char *modname, const char *modprobe, int quiet); extern int load_xtables_ko(const char *modprobe, int quiet); |