From 661f112072bc13a1625c4eb5983695e122ea97da Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 30 Jul 2007 14:46:51 +0000 Subject: Make the option structures const. Signed-off-by: Jan Engelhardt --- extensions/libip6t_CONNMARK.c | 2 +- extensions/libip6t_CONNSECMARK.c | 2 +- extensions/libip6t_HL.c | 2 +- extensions/libip6t_LOG.c | 2 +- extensions/libip6t_MARK.c | 2 +- extensions/libip6t_NFLOG.c | 2 +- extensions/libip6t_REJECT.c | 2 +- extensions/libip6t_ah.c | 2 +- extensions/libip6t_condition.c | 2 +- extensions/libip6t_connmark.c | 2 +- extensions/libip6t_dst.c | 2 +- extensions/libip6t_frag.c | 2 +- extensions/libip6t_hashlimit.c | 2 +- extensions/libip6t_hbh.c | 4 ++-- extensions/libip6t_hl.c | 2 +- extensions/libip6t_icmp6.c | 2 +- extensions/libip6t_ipv6header.c | 2 +- extensions/libip6t_mh.c | 2 +- extensions/libip6t_owner.c | 2 +- extensions/libip6t_policy.c | 2 +- extensions/libip6t_rt.c | 2 +- extensions/libip6t_state.c | 2 +- extensions/libipt_CLASSIFY.c | 2 +- extensions/libipt_CLUSTERIP.c | 2 +- extensions/libipt_CONNMARK.c | 2 +- extensions/libipt_CONNSECMARK.c | 2 +- extensions/libipt_DNAT.c | 2 +- extensions/libipt_DSCP.c | 2 +- extensions/libipt_ECN.c | 2 +- extensions/libipt_LOG.c | 2 +- extensions/libipt_MARK.c | 2 +- extensions/libipt_MASQUERADE.c | 2 +- extensions/libipt_NETMAP.c | 2 +- extensions/libipt_NFLOG.c | 2 +- extensions/libipt_REDIRECT.c | 2 +- extensions/libipt_REJECT.c | 2 +- extensions/libipt_SAME.c | 2 +- extensions/libipt_SET.c | 2 +- extensions/libipt_SNAT.c | 2 +- extensions/libipt_TOS.c | 4 ++-- extensions/libipt_TTL.c | 2 +- extensions/libipt_ULOG.c | 2 +- extensions/libipt_addrtype.c | 4 ++-- extensions/libipt_ah.c | 2 +- extensions/libipt_condition.c | 2 +- extensions/libipt_connbytes.c | 2 +- extensions/libipt_connmark.c | 2 +- extensions/libipt_connrate.c | 2 +- extensions/libipt_conntrack.c | 2 +- extensions/libipt_dscp_helper.c | 2 +- extensions/libipt_ecn.c | 2 +- extensions/libipt_hashlimit.c | 2 +- extensions/libipt_helper.c | 2 +- extensions/libipt_icmp.c | 2 +- extensions/libipt_iprange.c | 2 +- extensions/libipt_owner.c | 2 +- extensions/libipt_policy.c | 2 +- extensions/libipt_realm.c | 2 +- extensions/libipt_recent.c | 2 +- extensions/libipt_set.c | 2 +- extensions/libipt_state.c | 2 +- extensions/libipt_statistic.c | 2 +- extensions/libipt_tos.c | 4 ++-- extensions/libipt_ttl.c | 2 +- extensions/libxt_NFQUEUE.c | 2 +- extensions/libxt_SECMARK.c | 2 +- extensions/libxt_TCPMSS.c | 2 +- extensions/libxt_comment.c | 2 +- extensions/libxt_dccp.c | 2 +- extensions/libxt_dscp.c | 2 +- extensions/libxt_esp.c | 2 +- extensions/libxt_length.c | 2 +- extensions/libxt_limit.c | 2 +- extensions/libxt_mac.c | 2 +- extensions/libxt_mark.c | 2 +- extensions/libxt_multiport.c | 2 +- extensions/libxt_physdev.c | 2 +- extensions/libxt_pkttype.c | 2 +- extensions/libxt_quota.c | 2 +- extensions/libxt_sctp.c | 2 +- extensions/libxt_string.c | 2 +- extensions/libxt_tcp.c | 2 +- extensions/libxt_tcpmss.c | 2 +- extensions/libxt_udp.c | 2 +- 84 files changed, 88 insertions(+), 88 deletions(-) (limited to 'extensions') diff --git a/extensions/libip6t_CONNMARK.c b/extensions/libip6t_CONNMARK.c index 69d3a5aa..03441d73 100644 --- a/extensions/libip6t_CONNMARK.c +++ b/extensions/libip6t_CONNMARK.c @@ -48,7 +48,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "set-mark", 1, 0, '1' }, { "save-mark", 0, 0, '2' }, { "restore-mark", 0, 0, '3' }, diff --git a/extensions/libip6t_CONNSECMARK.c b/extensions/libip6t_CONNSECMARK.c index 805492c5..93d0c966 100644 --- a/extensions/libip6t_CONNSECMARK.c +++ b/extensions/libip6t_CONNSECMARK.c @@ -24,7 +24,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "save", 0, 0, '1' }, { "restore", 0, 0, '2' }, { 0 } diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c index 33bab714..d215eaa5 100644 --- a/extensions/libip6t_HL.c +++ b/extensions/libip6t_HL.c @@ -138,7 +138,7 @@ static void print(const void *ip, printf("%u ", info->hop_limit); } -static struct option opts[] = { +static const struct option opts[] = { { "hl-set", 1, 0, '1' }, { "hl-dec", 1, 0, '2' }, { "hl-inc", 1, 0, '3' }, diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c index 7fdbc0c8..a11b8c01 100644 --- a/extensions/libip6t_LOG.c +++ b/extensions/libip6t_LOG.c @@ -32,7 +32,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "log-level", .has_arg = 1, .flag = 0, .val = '!' }, { .name = "log-prefix", .has_arg = 1, .flag = 0, .val = '#' }, { .name = "log-tcp-sequence", .has_arg = 0, .flag = 0, .val = '1' }, diff --git a/extensions/libip6t_MARK.c b/extensions/libip6t_MARK.c index 0ca40595..19bf40d2 100644 --- a/extensions/libip6t_MARK.c +++ b/extensions/libip6t_MARK.c @@ -20,7 +20,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "set-mark", .has_arg = 1, .flag = 0, .val = '1' }, { .name = 0 } }; diff --git a/extensions/libip6t_NFLOG.c b/extensions/libip6t_NFLOG.c index 22c99e90..42e20819 100644 --- a/extensions/libip6t_NFLOG.c +++ b/extensions/libip6t_NFLOG.c @@ -14,7 +14,7 @@ enum { NFLOG_THRESHOLD = 0x8, }; -static struct option opts[] = { +static const struct option opts[] = { { "nflog-group", 1, 0, NFLOG_GROUP }, { "nflog-prefix", 1, 0, NFLOG_PREFIX }, { "nflog-range", 1, 0, NFLOG_RANGE }, diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c index ffc9680e..c67de0eb 100644 --- a/extensions/libip6t_REJECT.c +++ b/extensions/libip6t_REJECT.c @@ -65,7 +65,7 @@ help(void) print_reject_types(); } -static struct option opts[] = { +static const struct option opts[] = { { "reject-with", 1, 0, '1' }, { 0 } }; diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c index 2379f21a..d3048a26 100644 --- a/extensions/libip6t_ah.c +++ b/extensions/libip6t_ah.c @@ -20,7 +20,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "ahspi", .has_arg = 1, .flag = 0, .val = '1' }, { .name = "ahlen", .has_arg = 1, .flag = 0, .val = '2' }, { .name = "ahres", .has_arg = 0, .flag = 0, .val = '3' }, diff --git a/extensions/libip6t_condition.c b/extensions/libip6t_condition.c index 633eef19..40d05225 100644 --- a/extensions/libip6t_condition.c +++ b/extensions/libip6t_condition.c @@ -19,7 +19,7 @@ help(void) } -static struct option opts[] = { +static const struct option opts[] = { { .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' }, { .name = 0 } }; diff --git a/extensions/libip6t_connmark.c b/extensions/libip6t_connmark.c index 0a67c3a2..427003a3 100644 --- a/extensions/libip6t_connmark.c +++ b/extensions/libip6t_connmark.c @@ -39,7 +39,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "mark", 1, 0, '1' }, {0} }; diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c index 8c9455b1..cb49c1fb 100644 --- a/extensions/libip6t_dst.c +++ b/extensions/libip6t_dst.c @@ -31,7 +31,7 @@ UNAME " v%s options:\n" IPTABLES_VERSION, IP6T_OPTS_OPTSNR); } -static struct option opts[] = { +static const struct option opts[] = { { .name = LNAME "-len", .has_arg = 1, .flag = 0, .val = '1' }, { .name = LNAME "-opts", .has_arg = 1, .flag = 0, .val = '2' }, { .name = LNAME "-not-strict", .has_arg = 1, .flag = 0, .val = '3' }, diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c index fcdee1b6..1e184b73 100644 --- a/extensions/libip6t_frag.c +++ b/extensions/libip6t_frag.c @@ -23,7 +23,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "fragid", .has_arg = 1, .flag = 0, .val = '1' }, { .name = "fraglen", .has_arg = 1, .flag = 0, .val = '2' }, { .name = "fragres", .has_arg = 0, .flag = 0, .val = '3' }, diff --git a/extensions/libip6t_hashlimit.c b/extensions/libip6t_hashlimit.c index 9f820fc8..22cca0be 100644 --- a/extensions/libip6t_hashlimit.c +++ b/extensions/libip6t_hashlimit.c @@ -46,7 +46,7 @@ help(void) "\n", IPTABLES_VERSION, XT_HASHLIMIT_BURST); } -static struct option opts[] = { +static const struct option opts[] = { { "hashlimit", 1, 0, '%' }, { "hashlimit-burst", 1, 0, '$' }, { "hashlimit-htable-size", 1, 0, '&' }, diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c index 4312399e..c139c233 100644 --- a/extensions/libip6t_hbh.c +++ b/extensions/libip6t_hbh.c @@ -30,14 +30,14 @@ UNAME , IPTABLES_VERSION, LNAME, LNAME, IP6T_OPTS_OPTSNR); } #if HOPBYHOP -static struct option opts[] = { +static const struct option opts[] = { { "hbh-len", 1, 0, '1' }, { "hbh-opts", 1, 0, '2' }, { "hbh-not-strict", 1, 0, '3' }, {0} }; #else -static struct option opts[] = { +static const struct option opts[] = { { "dst-len", 1, 0, '1' }, { "dst-opts", 1, 0, '2' }, { "dst-not-strict", 1, 0, '3' }, diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c index 58b9fcfd..197ef853 100644 --- a/extensions/libip6t_hl.c +++ b/extensions/libip6t_hl.c @@ -120,7 +120,7 @@ static void save(const void *ip, printf("--hl-%s %u ", op[info->mode], info->hop_limit); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "hl", .has_arg = 1, .flag = 0, .val = '2' }, { .name = "hl-eq", .has_arg = 1, .flag = 0, .val = '2' }, { .name = "hl-lt", .has_arg = 1, .flag = 0, .val = '3' }, diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c index bc150c28..46c9d38d 100644 --- a/extensions/libip6t_icmp6.c +++ b/extensions/libip6t_icmp6.c @@ -85,7 +85,7 @@ help(void) print_icmpv6types(); } -static struct option opts[] = { +static const struct option opts[] = { { "icmpv6-type", 1, 0, '1' }, {0} }; diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c index 858e0293..4dab33fc 100644 --- a/extensions/libip6t_ipv6header.c +++ b/extensions/libip6t_ipv6header.c @@ -148,7 +148,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "header", 1, 0, '1' }, { "soft", 0, 0, '2' }, { 0 } diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c index 3ae1cd44..d2f9cec9 100644 --- a/extensions/libip6t_mh.c +++ b/extensions/libip6t_mh.c @@ -226,7 +226,7 @@ static void save(const void *ip, const struct xt_entry_match *match) printf("--mh-type %u ", mhinfo->types[0]); } -static struct option opts[] = { +static const struct option opts[] = { { "mh-type", 1, 0, '1' }, {0} }; diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c index ff671ab2..a5ec8da5 100644 --- a/extensions/libip6t_owner.c +++ b/extensions/libip6t_owner.c @@ -36,7 +36,7 @@ IPTABLES_VERSION); #endif /* IP6T_OWNER_COMM */ } -static struct option opts[] = { +static const struct option opts[] = { { "uid-owner", 1, 0, '1' }, { "gid-owner", 1, 0, '2' }, { "pid-owner", 1, 0, '3' }, diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index b7062c62..4612e141 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -41,7 +41,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = +static const struct option opts[] = { { .name = "dir", diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c index a36c65ae..3c3911e3 100644 --- a/extensions/libip6t_rt.c +++ b/extensions/libip6t_rt.c @@ -29,7 +29,7 @@ help(void) IPTABLES_VERSION, IP6T_RT_HOPS); } -static struct option opts[] = { +static const struct option opts[] = { { "rt-type", 1, 0, '1' }, { "rt-segsleft", 1, 0, '2' }, { "rt-len", 1, 0, '3' }, diff --git a/extensions/libip6t_state.c b/extensions/libip6t_state.c index b7c25172..d7fc83c7 100644 --- a/extensions/libip6t_state.c +++ b/extensions/libip6t_state.c @@ -23,7 +23,7 @@ help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "state", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_CLASSIFY.c b/extensions/libipt_CLASSIFY.c index 044ea959..3096edc8 100644 --- a/extensions/libipt_CLASSIFY.c +++ b/extensions/libipt_CLASSIFY.c @@ -21,7 +21,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "set-class", 1, 0, '1' }, { 0 } }; diff --git a/extensions/libipt_CLUSTERIP.c b/extensions/libipt_CLUSTERIP.c index 30ae3bfc..aa2ad2c7 100644 --- a/extensions/libipt_CLUSTERIP.c +++ b/extensions/libipt_CLUSTERIP.c @@ -44,7 +44,7 @@ IPTABLES_VERSION); #define PARAM_LOCALNODE 0x0010 #define PARAM_HASHINIT 0x0020 -static struct option opts[] = { +static const struct option opts[] = { { "new", 0, 0, '1' }, { "hashmode", 1, 0, '2' }, { "clustermac", 1, 0, '3' }, diff --git a/extensions/libipt_CONNMARK.c b/extensions/libipt_CONNMARK.c index fbf0d4d0..2797b1bc 100644 --- a/extensions/libipt_CONNMARK.c +++ b/extensions/libipt_CONNMARK.c @@ -48,7 +48,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "set-mark", 1, 0, '1' }, { "save-mark", 0, 0, '2' }, { "restore-mark", 0, 0, '3' }, diff --git a/extensions/libipt_CONNSECMARK.c b/extensions/libipt_CONNSECMARK.c index 191cd9ad..07b8527b 100644 --- a/extensions/libipt_CONNSECMARK.c +++ b/extensions/libipt_CONNSECMARK.c @@ -24,7 +24,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "save", 0, 0, '1' }, { "restore", 0, 0, '2' }, { 0 } diff --git a/extensions/libipt_DNAT.c b/extensions/libipt_DNAT.c index 0d787637..9f48e9c5 100644 --- a/extensions/libipt_DNAT.c +++ b/extensions/libipt_DNAT.c @@ -32,7 +32,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "to-destination", 1, 0, '1' }, { "random", 0, 0, '2' }, { 0 } diff --git a/extensions/libipt_DSCP.c b/extensions/libipt_DSCP.c index b1a0df0f..029c54fe 100644 --- a/extensions/libipt_DSCP.c +++ b/extensions/libipt_DSCP.c @@ -42,7 +42,7 @@ static void help(void) ); } -static struct option opts[] = { +static const struct option opts[] = { { "set-dscp", 1, 0, 'F' }, { "set-dscp-class", 1, 0, 'G' }, { 0 } diff --git a/extensions/libipt_ECN.c b/extensions/libipt_ECN.c index 7c6c2939..314531e3 100644 --- a/extensions/libipt_ECN.c +++ b/extensions/libipt_ECN.c @@ -37,7 +37,7 @@ static void help(void) #endif -static struct option opts[] = { +static const struct option opts[] = { { "ecn-tcp-remove", 0, 0, 'F' }, { "ecn-tcp-cwr", 1, 0, 'G' }, { "ecn-tcp-ece", 1, 0, 'H' }, diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c index dca1edf2..4be14d5c 100644 --- a/extensions/libipt_LOG.c +++ b/extensions/libipt_LOG.c @@ -32,7 +32,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "log-level", .has_arg = 1, .flag = 0, .val = '!' }, { .name = "log-prefix", .has_arg = 1, .flag = 0, .val = '#' }, { .name = "log-tcp-sequence", .has_arg = 0, .flag = 0, .val = '1' }, diff --git a/extensions/libipt_MARK.c b/extensions/libipt_MARK.c index 6a947182..6c966566 100644 --- a/extensions/libipt_MARK.c +++ b/extensions/libipt_MARK.c @@ -22,7 +22,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "set-mark", 1, 0, '1' }, { "and-mark", 1, 0, '2' }, { "or-mark", 1, 0, '3' }, diff --git a/extensions/libipt_MASQUERADE.c b/extensions/libipt_MASQUERADE.c index 0a949391..07e93b38 100644 --- a/extensions/libipt_MASQUERADE.c +++ b/extensions/libipt_MASQUERADE.c @@ -23,7 +23,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "to-ports", 1, 0, '1' }, { "random", 0, 0, '2' }, { 0 } diff --git a/extensions/libipt_NETMAP.c b/extensions/libipt_NETMAP.c index 302448f6..ef06e01c 100644 --- a/extensions/libipt_NETMAP.c +++ b/extensions/libipt_NETMAP.c @@ -13,7 +13,7 @@ #define MODULENAME "NETMAP" -static struct option opts[] = { +static const struct option opts[] = { { "to", 1, 0, '1' }, { 0 } }; diff --git a/extensions/libipt_NFLOG.c b/extensions/libipt_NFLOG.c index 37df5b0d..a672e2d3 100644 --- a/extensions/libipt_NFLOG.c +++ b/extensions/libipt_NFLOG.c @@ -14,7 +14,7 @@ enum { NFLOG_THRESHOLD = 0x8, }; -static struct option opts[] = { +static const struct option opts[] = { { "nflog-group", 1, 0, NFLOG_GROUP }, { "nflog-prefix", 1, 0, NFLOG_PREFIX }, { "nflog-range", 1, 0, NFLOG_RANGE }, diff --git a/extensions/libipt_REDIRECT.c b/extensions/libipt_REDIRECT.c index 0aff8be8..919fde57 100644 --- a/extensions/libipt_REDIRECT.c +++ b/extensions/libipt_REDIRECT.c @@ -22,7 +22,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "to-ports", 1, 0, '1' }, { "random", 1, 0, '2' }, { 0 } diff --git a/extensions/libipt_REJECT.c b/extensions/libipt_REJECT.c index 4e083f39..8aba561e 100644 --- a/extensions/libipt_REJECT.c +++ b/extensions/libipt_REJECT.c @@ -80,7 +80,7 @@ help(void) printf("(*) See man page or read the INCOMPATIBILITES file for compatibility issues.\n"); } -static struct option opts[] = { +static const struct option opts[] = { { "reject-with", 1, 0, '1' }, { 0 } }; diff --git a/extensions/libipt_SAME.c b/extensions/libipt_SAME.c index b14c5016..fe4df992 100644 --- a/extensions/libipt_SAME.c +++ b/extensions/libipt_SAME.c @@ -29,7 +29,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "to", 1, 0, '1' }, { "nodst", 0, 0, '2'}, { "random", 0, 0, '3' }, diff --git a/extensions/libipt_SET.c b/extensions/libipt_SET.c index a095e11e..0425d20d 100644 --- a/extensions/libipt_SET.c +++ b/extensions/libipt_SET.c @@ -34,7 +34,7 @@ static void help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { {"add-set", 1, 0, '1'}, {"del-set", 1, 0, '2'}, {0} diff --git a/extensions/libipt_SNAT.c b/extensions/libipt_SNAT.c index a18e36a9..9460612d 100644 --- a/extensions/libipt_SNAT.c +++ b/extensions/libipt_SNAT.c @@ -32,7 +32,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "to-source", 1, 0, '1' }, { "random", 0, 0, '2' }, { 0 } diff --git a/extensions/libipt_TOS.c b/extensions/libipt_TOS.c index b1e7186a..d6b8c36d 100644 --- a/extensions/libipt_TOS.c +++ b/extensions/libipt_TOS.c @@ -14,7 +14,7 @@ struct tosinfo { }; /* TOS names and values. */ -static +static const struct TOS_value { unsigned char TOS; @@ -47,7 +47,7 @@ IPTABLES_VERSION); fputc('\n', stdout); } -static struct option opts[] = { +static const struct option opts[] = { { "set-tos", 1, 0, '1' }, { 0 } }; diff --git a/extensions/libipt_TTL.c b/extensions/libipt_TTL.c index 6110e0eb..fa3205a1 100644 --- a/extensions/libipt_TTL.c +++ b/extensions/libipt_TTL.c @@ -138,7 +138,7 @@ static void print(const void *ip, printf("%u ", info->ttl); } -static struct option opts[] = { +static const struct option opts[] = { { "ttl-set", 1, 0, '1' }, { "ttl-dec", 1, 0, '2' }, { "ttl-inc", 1, 0, '3' }, diff --git a/extensions/libipt_ULOG.c b/extensions/libipt_ULOG.c index 88fc16d9..cc65bba9 100644 --- a/extensions/libipt_ULOG.c +++ b/extensions/libipt_ULOG.c @@ -44,7 +44,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { {"ulog-nlgroup", 1, 0, '!'}, {"ulog-prefix", 1, 0, '#'}, {"ulog-cprange", 1, 0, 'A'}, diff --git a/extensions/libipt_addrtype.c b/extensions/libipt_addrtype.c index ed8b2046..f377e90d 100644 --- a/extensions/libipt_addrtype.c +++ b/extensions/libipt_addrtype.c @@ -12,7 +12,7 @@ #include /* from linux/rtnetlink.h, must match order of enumeration */ -static char *rtn_names[] = { +static const char *const rtn_names[] = { "UNSPEC", "UNICAST", "LOCAL", @@ -179,7 +179,7 @@ static void save(const void *ip, } } -static struct option opts[] = { +static const struct option opts[] = { { "src-type", 1, 0, '1' }, { "dst-type", 1, 0, '2' }, { 0 } diff --git a/extensions/libipt_ah.c b/extensions/libipt_ah.c index 3bc2d8d8..feba38ac 100644 --- a/extensions/libipt_ah.c +++ b/extensions/libipt_ah.c @@ -19,7 +19,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "ahspi", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_condition.c b/extensions/libipt_condition.c index 0876cd62..30391d35 100644 --- a/extensions/libipt_condition.c +++ b/extensions/libipt_condition.c @@ -19,7 +19,7 @@ help(void) } -static struct option opts[] = { +static const struct option opts[] = { { .name = "condition", .has_arg = 1, .flag = 0, .val = 'X' }, { .name = 0 } }; diff --git a/extensions/libipt_connbytes.c b/extensions/libipt_connbytes.c index 9b40d5a5..3c20bafa 100644 --- a/extensions/libipt_connbytes.c +++ b/extensions/libipt_connbytes.c @@ -20,7 +20,7 @@ help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "connbytes", 1, 0, '1' }, { "connbytes-dir", 1, 0, '2' }, { "connbytes-mode", 1, 0, '3' }, diff --git a/extensions/libipt_connmark.c b/extensions/libipt_connmark.c index 86248d9d..31a45549 100644 --- a/extensions/libipt_connmark.c +++ b/extensions/libipt_connmark.c @@ -39,7 +39,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "mark", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_connrate.c b/extensions/libipt_connrate.c index 9a7563e2..a12cd8aa 100644 --- a/extensions/libipt_connrate.c +++ b/extensions/libipt_connrate.c @@ -29,7 +29,7 @@ help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "connrate", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_conntrack.c b/extensions/libipt_conntrack.c index b50a58bb..d3999cf1 100644 --- a/extensions/libipt_conntrack.c +++ b/extensions/libipt_conntrack.c @@ -43,7 +43,7 @@ help(void) -static struct option opts[] = { +static const struct option opts[] = { { "ctstate", 1, 0, '1' }, { "ctproto", 1, 0, '2' }, { "ctorigsrc", 1, 0, '3' }, diff --git a/extensions/libipt_dscp_helper.c b/extensions/libipt_dscp_helper.c index fb68bb92..34aa1d31 100644 --- a/extensions/libipt_dscp_helper.c +++ b/extensions/libipt_dscp_helper.c @@ -14,7 +14,7 @@ #include -static struct ds_class +static const struct ds_class { const char *name; unsigned int dscp; diff --git a/extensions/libipt_ecn.c b/extensions/libipt_ecn.c index 8a5a7d39..538966ff 100644 --- a/extensions/libipt_ecn.c +++ b/extensions/libipt_ecn.c @@ -26,7 +26,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "ecn-tcp-cwr", .has_arg = 0, .flag = 0, .val = 'F' }, { .name = "ecn-tcp-ece", .has_arg = 0, .flag = 0, .val = 'G' }, { .name = "ecn-ip-ect", .has_arg = 1, .flag = 0, .val = 'H' }, diff --git a/extensions/libipt_hashlimit.c b/extensions/libipt_hashlimit.c index 552d3bff..c1cc7cb3 100644 --- a/extensions/libipt_hashlimit.c +++ b/extensions/libipt_hashlimit.c @@ -46,7 +46,7 @@ help(void) "\n", IPTABLES_VERSION, IPT_HASHLIMIT_BURST); } -static struct option opts[] = { +static const struct option opts[] = { { "hashlimit", 1, 0, '%' }, { "hashlimit-burst", 1, 0, '$' }, { "hashlimit-htable-size", 1, 0, '&' }, diff --git a/extensions/libipt_helper.c b/extensions/libipt_helper.c index e5772555..c862541d 100644 --- a/extensions/libipt_helper.c +++ b/extensions/libipt_helper.c @@ -19,7 +19,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "helper", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_icmp.c b/extensions/libipt_icmp.c index 21da4ea1..f46c004a 100644 --- a/extensions/libipt_icmp.c +++ b/extensions/libipt_icmp.c @@ -109,7 +109,7 @@ help(void) print_icmptypes(); } -static struct option opts[] = { +static const struct option opts[] = { { "icmp-type", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_iprange.c b/extensions/libipt_iprange.c index 3a039b12..30696aaf 100644 --- a/extensions/libipt_iprange.c +++ b/extensions/libipt_iprange.c @@ -20,7 +20,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "src-range", 1, 0, '1' }, { "dst-range", 1, 0, '2' }, {0} diff --git a/extensions/libipt_owner.c b/extensions/libipt_owner.c index c7217743..03f9b053 100644 --- a/extensions/libipt_owner.c +++ b/extensions/libipt_owner.c @@ -38,7 +38,7 @@ IPTABLES_VERSION); #endif /* IPT_OWNER_COMM */ } -static struct option opts[] = { +static const struct option opts[] = { { "uid-owner", 1, 0, '1' }, { "gid-owner", 1, 0, '2' }, { "pid-owner", 1, 0, '3' }, diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c index 978edb00..97b7d02d 100644 --- a/extensions/libipt_policy.c +++ b/extensions/libipt_policy.c @@ -40,7 +40,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = +static const struct option opts[] = { { .name = "dir", diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c index 445bcc82..0b11457b 100644 --- a/extensions/libipt_realm.c +++ b/extensions/libipt_realm.c @@ -25,7 +25,7 @@ help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "realm", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c index 38d58711..94721b3f 100644 --- a/extensions/libipt_recent.c +++ b/extensions/libipt_recent.c @@ -22,7 +22,7 @@ #endif /* IPT_RECENT_NAME_LEN */ /* Options for this module */ -static struct option opts[] = { +static const struct option opts[] = { { .name = "set", .has_arg = 0, .flag = 0, .val = 201 }, { .name = "rcheck", .has_arg = 0, .flag = 0, .val = 202 }, { .name = "update", .has_arg = 0, .flag = 0, .val = 203 }, diff --git a/extensions/libipt_set.c b/extensions/libipt_set.c index 4bd9bd22..d5cc1c3e 100644 --- a/extensions/libipt_set.c +++ b/extensions/libipt_set.c @@ -32,7 +32,7 @@ static void help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { {"set", 1, 0, '1'}, {0} }; diff --git a/extensions/libipt_state.c b/extensions/libipt_state.c index a6d9dc37..c4e5ef3a 100644 --- a/extensions/libipt_state.c +++ b/extensions/libipt_state.c @@ -23,7 +23,7 @@ help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "state", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_statistic.c b/extensions/libipt_statistic.c index 52357ec0..21122591 100644 --- a/extensions/libipt_statistic.c +++ b/extensions/libipt_statistic.c @@ -23,7 +23,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "mode", 1, 0, '1' }, { "probability", 1, 0, '2' }, { "every", 1, 0, '3' }, diff --git a/extensions/libipt_tos.c b/extensions/libipt_tos.c index efc216c4..2f5f9159 100644 --- a/extensions/libipt_tos.c +++ b/extensions/libipt_tos.c @@ -9,7 +9,7 @@ #include /* TOS names and values. */ -static +static const struct TOS_value { unsigned char TOS; @@ -42,7 +42,7 @@ IPTABLES_VERSION); fputc('\n', stdout); } -static struct option opts[] = { +static const struct option opts[] = { { "tos", 1, 0, '1' }, {0} }; diff --git a/extensions/libipt_ttl.c b/extensions/libipt_ttl.c index 5409deec..f5602f5e 100644 --- a/extensions/libipt_ttl.c +++ b/extensions/libipt_ttl.c @@ -143,7 +143,7 @@ static void save(const void *ip, printf("%u ", info->ttl); } -static struct option opts[] = { +static const struct option opts[] = { { "ttl", 1, 0, '2' }, { "ttl-eq", 1, 0, '2'}, { "ttl-lt", 1, 0, '3'}, diff --git a/extensions/libxt_NFQUEUE.c b/extensions/libxt_NFQUEUE.c index 7b3dcecc..c5e73250 100644 --- a/extensions/libxt_NFQUEUE.c +++ b/extensions/libxt_NFQUEUE.c @@ -27,7 +27,7 @@ static void help(void) ); } -static struct option opts[] = { +static const struct option opts[] = { { "queue-num", 1, 0, 'F' }, { 0 } }; diff --git a/extensions/libxt_SECMARK.c b/extensions/libxt_SECMARK.c index 8bf19bce..11a617b7 100644 --- a/extensions/libxt_SECMARK.c +++ b/extensions/libxt_SECMARK.c @@ -23,7 +23,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "selctx", 1, 0, '1' }, { 0 } }; diff --git a/extensions/libxt_TCPMSS.c b/extensions/libxt_TCPMSS.c index cd2fc420..12b4cb61 100644 --- a/extensions/libxt_TCPMSS.c +++ b/extensions/libxt_TCPMSS.c @@ -36,7 +36,7 @@ static void help6(void) __help(60); } -static struct option opts[] = { +static const struct option opts[] = { { "set-mss", 1, 0, '1' }, { "clamp-mss-to-pmtu", 0, 0, '2' }, { 0 } diff --git a/extensions/libxt_comment.c b/extensions/libxt_comment.c index 770a3ec5..db45ab66 100644 --- a/extensions/libxt_comment.c +++ b/extensions/libxt_comment.c @@ -24,7 +24,7 @@ help(void) ); } -static struct option opts[] = { +static const struct option opts[] = { { "comment", 1, 0, '1' }, {0} }; diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c index f4918dd7..45c7e380 100644 --- a/extensions/libxt_dccp.c +++ b/extensions/libxt_dccp.c @@ -46,7 +46,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "source-port", .has_arg = 1, .flag = 0, .val = '1' }, { .name = "sport", .has_arg = 1, .flag = 0, .val = '1' }, { .name = "destination-port", .has_arg = 1, .flag = 0, .val = '2' }, diff --git a/extensions/libxt_dscp.c b/extensions/libxt_dscp.c index 3f5f6c64..e2de9406 100644 --- a/extensions/libxt_dscp.c +++ b/extensions/libxt_dscp.c @@ -39,7 +39,7 @@ static void help(void) ); } -static struct option opts[] = { +static const struct option opts[] = { { "dscp", 1, 0, 'F' }, { "dscp-class", 1, 0, 'G' }, { 0 } diff --git a/extensions/libxt_esp.c b/extensions/libxt_esp.c index 7eb030e8..6836dfc3 100644 --- a/extensions/libxt_esp.c +++ b/extensions/libxt_esp.c @@ -19,7 +19,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "espspi", 1, 0, '1' }, {0} }; diff --git a/extensions/libxt_length.c b/extensions/libxt_length.c index 345423d7..46a4ad2c 100644 --- a/extensions/libxt_length.c +++ b/extensions/libxt_length.c @@ -20,7 +20,7 @@ IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "length", 1, 0, '1' }, {0} }; diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c index c85536bd..f8c9e641 100644 --- a/extensions/libxt_limit.c +++ b/extensions/libxt_limit.c @@ -30,7 +30,7 @@ help(void) "\n", IPTABLES_VERSION, XT_LIMIT_BURST); } -static struct option opts[] = { +static const struct option opts[] = { { "limit", 1, 0, '%' }, { "limit-burst", 1, 0, '$' }, { 0 } diff --git a/extensions/libxt_mac.c b/extensions/libxt_mac.c index b907594c..b935ea55 100644 --- a/extensions/libxt_mac.c +++ b/extensions/libxt_mac.c @@ -23,7 +23,7 @@ help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "mac-source", 1, 0, '1' }, {0} }; diff --git a/extensions/libxt_mark.c b/extensions/libxt_mark.c index 04104d13..23643dcd 100644 --- a/extensions/libxt_mark.c +++ b/extensions/libxt_mark.c @@ -20,7 +20,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "mark", 1, 0, '1' }, {0} }; diff --git a/extensions/libxt_multiport.c b/extensions/libxt_multiport.c index 274a5830..f7e67daa 100644 --- a/extensions/libxt_multiport.c +++ b/extensions/libxt_multiport.c @@ -45,7 +45,7 @@ help_v1(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "source-ports", 1, 0, '1' }, { "sports", 1, 0, '1' }, /* synonym */ { "destination-ports", 1, 0, '2' }, diff --git a/extensions/libxt_physdev.c b/extensions/libxt_physdev.c index 0f862c0c..55174724 100644 --- a/extensions/libxt_physdev.c +++ b/extensions/libxt_physdev.c @@ -25,7 +25,7 @@ help(void) "\n", IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "physdev-in", 1, 0, '1' }, { "physdev-out", 1, 0, '2' }, { "physdev-is-in", 0, 0, '3' }, diff --git a/extensions/libxt_pkttype.c b/extensions/libxt_pkttype.c index 81cd943e..3732034c 100644 --- a/extensions/libxt_pkttype.c +++ b/extensions/libxt_pkttype.c @@ -64,7 +64,7 @@ static void help(void) print_types(); } -static struct option opts[] = { +static const struct option opts[] = { {"pkt-type", 1, 0, '1'}, {0} }; diff --git a/extensions/libxt_quota.c b/extensions/libxt_quota.c index f97f02cd..ab4fb96f 100644 --- a/extensions/libxt_quota.c +++ b/extensions/libxt_quota.c @@ -11,7 +11,7 @@ #include -static struct option opts[] = { +static const struct option opts[] = { {"quota", 1, 0, '1'}, {0} }; diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c index 5d23f091..734e706a 100644 --- a/extensions/libxt_sctp.c +++ b/extensions/libxt_sctp.c @@ -69,7 +69,7 @@ static void help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { .name = "source-port", .has_arg = 1, .flag = 0, .val = '1' }, { .name = "sport", .has_arg = 1, .flag = 0, .val = '1' }, { .name = "destination-port", .has_arg = 1, .flag = 0, .val = '2' }, diff --git a/extensions/libxt_string.c b/extensions/libxt_string.c index c58f4814..ea0a2aa4 100644 --- a/extensions/libxt_string.c +++ b/extensions/libxt_string.c @@ -44,7 +44,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "from", 1, 0, '1' }, { "to", 1, 0, '2' }, { "algo", 1, 0, '3' }, diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c index da4922b6..e5db6376 100644 --- a/extensions/libxt_tcp.c +++ b/extensions/libxt_tcp.c @@ -27,7 +27,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "source-port", 1, 0, '1' }, { "sport", 1, 0, '1' }, /* synonym */ { "destination-port", 1, 0, '2' }, diff --git a/extensions/libxt_tcpmss.c b/extensions/libxt_tcpmss.c index 4b421b21..817578a1 100644 --- a/extensions/libxt_tcpmss.c +++ b/extensions/libxt_tcpmss.c @@ -19,7 +19,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "mss", 1, 0, '1' }, {0} }; diff --git a/extensions/libxt_udp.c b/extensions/libxt_udp.c index 6942043f..81ff3145 100644 --- a/extensions/libxt_udp.c +++ b/extensions/libxt_udp.c @@ -22,7 +22,7 @@ help(void) IPTABLES_VERSION); } -static struct option opts[] = { +static const struct option opts[] = { { "source-port", 1, 0, '1' }, { "sport", 1, 0, '1' }, /* synonym */ { "destination-port", 1, 0, '2' }, -- cgit v1.2.3