diff options
| author | Jamal Hadi Salim <hadi@cyberus.ca> | 2009-02-11 13:05:43 +0100 |
|---|---|---|
| committer | Patrick McHardy <kaber@trash.net> | 2009-02-11 13:05:43 +0100 |
| commit | 8b7baebc93989106fd5d26b262d0ce191f8ef7c0 (patch) | |
| tree | 7f320fe1b60ff07e537149541da0f46316631996 /include | |
| parent | 7878483dfaf91adcdb7e8e88c93ded82312af39a (diff) | |
libxtables: simple aliasing macro for exit_error
Rename xtables_globals exit_error cb to exit_err and introduce
a very simple aliasing macro to point to it.
convert iptables, ip6tables and iptables_xml to use it.
Note iptables_xml does not have to define its own exit_error()
since it can use the basic one provided.
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: Patrick McHardy <kaber@trash.net>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xtables.h.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/xtables.h.in b/include/xtables.h.in index 3a166510..da7ee6b9 100644 --- a/include/xtables.h.in +++ b/include/xtables.h.in @@ -189,7 +189,7 @@ struct xtables_globals char *program_version; char *program_name; struct option *opts; - void (*exit_error)(enum xtables_exittype status, const char *msg, ...); + void (*exit_err)(enum xtables_exittype status, const char *msg, ...) __attribute__((noreturn, format(printf,2,3))); }; extern const char *xtables_program_name; @@ -204,7 +204,7 @@ extern void *xtables_malloc(size_t); extern int xtables_insmod(const char *, const char *, bool); extern int xtables_load_ko(const char *, bool); -int xtables_set_params(struct xtables_globals *xtp); +extern int xtables_set_params(struct xtables_globals *xtp); void xtables_free_opts(int reset_offset, struct option *original_opts); extern struct xtables_match *xtables_find_match(const char *name, @@ -230,8 +230,8 @@ xtables_parse_interface(const char *arg, char *vianame, unsigned char *mask); int xtables_check_inverse(const char option[], int *invert, int *my_optind, int argc); -void exit_error(enum xtables_exittype, const char *, ...) - __attribute__((noreturn, format(printf,2,3))); +extern struct xtables_globals *xt_params; +#define exit_error xt_params->exit_err extern void xtables_param_act(unsigned int, const char *, ...); extern const char *xtables_ipaddr_to_numeric(const struct in_addr *); |