From 630ef48037f3602333addfdb53789c9c6a4bb4c8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 27 Jan 2009 14:58:41 +0100 Subject: 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 --- include/xtables.h.in | 3 +++ include/xtables/internal.h | 3 --- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'include') 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); -- cgit v1.2.3