libxtables: inline and remove unused OPTION_OFFSET macro

Signed-off-by: Jan Engelhardt <jengelh@medozas.de>

diff --git a/include/xtables.h.in b/include/xtables.h.in
index b5f1af275b7367a1af91b5e663e459869676748f..c4d2b92230ea0fe5aeb17fc141240dba6212dc11 100644 (file)
--- a/include/xtables.h.in
+++ b/include/xtables.h.in
@@ -235,7 +235,6 @@ int xtables_check_inverse(const char option[], int *invert,
        int *my_optind, int argc);
 extern struct xtables_globals *xt_params;
 #define exit_error xt_params->exit_err
-#define OPTION_OFFSET 256
 
 extern void xtables_param_act(unsigned int, const char *, ...);
 

diff --git a/xtables.c b/xtables.c
index 50cfced86460c11eb1ca7866e481567fb0bd5e5d..f3056735595f564bffdb40c117804e1fb81029a8 100644 (file)
--- a/xtables.c
+++ b/xtables.c
@@ -96,7 +96,7 @@ struct option *xtables_merge_options(struct option *oldopts,
        for (num_old = 0; oldopts[num_old].name; num_old++) ;
        for (num_new = 0; newopts[num_new].name; num_new++) ;
 
-       xt_params->option_offset += OPTION_OFFSET;
+       xt_params->option_offset += 256;
        *option_offset = xt_params->option_offset;
 
        merge = malloc(sizeof(struct option) * (num_new + num_old + 1));