From: Jan Engelhardt <jengelh@medozas.de>
To: kaber@trash.net
Cc: netfilter-devel@vger.kernel.org, hadi@cyberus.ca
Subject: [PATCH 2/6] libxtables: inline and remove unused OPTION_OFFSET macro
Date: Sat, 21 Feb 2009 04:18:00 +0100 [thread overview]
Message-ID: <1235186284-31661-3-git-send-email-jengelh@medozas.de> (raw)
In-Reply-To: <1235186284-31661-1-git-send-email-jengelh@medozas.de>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
include/xtables.h.in | 1 -
xtables.c | 2 +-
2 files changed, 1 insertions(+), 2 deletions(-)
diff --git a/include/xtables.h.in b/include/xtables.h.in
index b5f1af2..c4d2b92 100644
--- 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 50cfced..f305673 100644
--- 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));
--
1.6.1.3
next prev parent reply other threads:[~2009-02-21 3:18 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-21 3:17 [pull] request for 20090220 Jan Engelhardt
2009-02-21 3:17 ` [PATCH 1/6] doc: resynchronize manpage with in-code help Jan Engelhardt
2009-02-21 3:18 ` Jan Engelhardt [this message]
2009-02-21 3:18 ` [PATCH 3/6] libxtables: prefix exit_error to xtables_error Jan Engelhardt
2009-02-21 7:37 ` Jesper Dangaard Brouer
2009-02-21 14:46 ` Jan Engelhardt
2009-02-23 16:46 ` Patrick McHardy
2009-02-23 16:53 ` Jan Engelhardt
2009-02-23 16:56 ` Patrick McHardy
2009-02-23 17:28 ` Jan Engelhardt
2009-02-27 19:16 ` Jan Engelhardt
2009-02-21 3:18 ` [PATCH 4/6] extensions: remove unwanted/add needed includes for IPv6 exts Jan Engelhardt
2009-02-21 3:18 ` [PATCH 5/6] extensions: remove unwanted/add needed includes for IPv4 exts Jan Engelhardt
2009-02-21 3:18 ` [PATCH 6/6] libxt_policy: use bounded strtoui Jan Engelhardt
2009-02-21 12:54 ` [pull] request for 20090220 jamal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1235186284-31661-3-git-send-email-jengelh@medozas.de \
--to=jengelh@medozas.de \
--cc=hadi@cyberus.ca \
--cc=kaber@trash.net \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).