From 0e2abed11985e16215559cefd90625f99317b96c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 4 Oct 2007 16:25:58 +0000 Subject: Constify data structures Constify more data structures. Make functions static. Signed-off-by: Jan Engelhardt --- extensions/libip6t_LOG.c | 2 +- extensions/libip6t_REJECT.c | 2 +- extensions/libip6t_policy.c | 2 +- extensions/libipt_LOG.c | 2 +- extensions/libipt_policy.c | 2 +- extensions/libipt_realm.c | 4 ++-- extensions/libxt_CLASSIFY.c | 2 +- extensions/libxt_dccp.c | 2 +- extensions/libxt_hashlimit.c | 2 +- extensions/libxt_limit.c | 2 +- extensions/libxt_sctp.c | 2 +- extensions/libxt_tcp.c | 2 +- 12 files changed, 13 insertions(+), 13 deletions(-) (limited to 'extensions') diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c index 737a597e..772e8f36 100644 --- a/extensions/libip6t_LOG.c +++ b/extensions/libip6t_LOG.c @@ -57,7 +57,7 @@ struct ip6t_log_names { unsigned int level; }; -static struct ip6t_log_names ip6t_log_names[] +static const struct ip6t_log_names ip6t_log_names[] = { { .name = "alert", .level = LOG_ALERT }, { .name = "crit", .level = LOG_CRIT }, { .name = "debug", .level = LOG_DEBUG }, diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c index 1d8c5d5a..be7cb06e 100644 --- a/extensions/libip6t_REJECT.c +++ b/extensions/libip6t_REJECT.c @@ -145,7 +145,7 @@ static void save(const void *ip, printf("--reject-with %s ", reject_table[i].name); } -struct ip6tables_target reject = { +static struct ip6tables_target reject = { .name = "REJECT", .version = IPTABLES_VERSION, .size = IP6T_ALIGN(sizeof(struct ip6t_reject_info)), diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c index 28caf03b..0ebe17bd 100644 --- a/extensions/libip6t_policy.c +++ b/extensions/libip6t_policy.c @@ -452,7 +452,7 @@ static void save(const void *ip, const struct xt_entry_match *match) } } -struct ip6tables_match policy = { +static struct ip6tables_match policy = { .name = "policy", .version = IPTABLES_VERSION, .size = IP6T_ALIGN(sizeof(struct ip6t_policy_info)), diff --git a/extensions/libipt_LOG.c b/extensions/libipt_LOG.c index cf8990ae..0f13c244 100644 --- a/extensions/libipt_LOG.c +++ b/extensions/libipt_LOG.c @@ -57,7 +57,7 @@ struct ipt_log_names { unsigned int level; }; -static struct ipt_log_names ipt_log_names[] +static const struct ipt_log_names ipt_log_names[] = { { .name = "alert", .level = LOG_ALERT }, { .name = "crit", .level = LOG_CRIT }, { .name = "debug", .level = LOG_DEBUG }, diff --git a/extensions/libipt_policy.c b/extensions/libipt_policy.c index ddafed1d..0e27975f 100644 --- a/extensions/libipt_policy.c +++ b/extensions/libipt_policy.c @@ -410,7 +410,7 @@ static void save(const void *ip, const struct xt_entry_match *match) } } -struct iptables_match policy = { +static struct iptables_match policy = { .name = "policy", .version = IPTABLES_VERSION, .size = IPT_ALIGN(sizeof(struct ipt_policy_info)), diff --git a/extensions/libipt_realm.c b/extensions/libipt_realm.c index 2304d685..2bd04c34 100644 --- a/extensions/libipt_realm.c +++ b/extensions/libipt_realm.c @@ -116,7 +116,7 @@ static void load_realms(void) } /* get realm id for name, -1 if error/not found */ -int realm_name2id(const char* name) +static int realm_name2id(const char* name) { struct realmname* cur; @@ -134,7 +134,7 @@ int realm_name2id(const char* name) } /* get realm name for id, NULL if error/not found */ -const char* realm_id2name(int id) +static const char *realm_id2name(int id) { struct realmname* cur; diff --git a/extensions/libxt_CLASSIFY.c b/extensions/libxt_CLASSIFY.c index 605c47e0..36e62e16 100644 --- a/extensions/libxt_CLASSIFY.c +++ b/extensions/libxt_CLASSIFY.c @@ -26,7 +26,7 @@ static const struct option opts[] = { { } }; -int string_to_priority(const char *s, unsigned int *p) +static int string_to_priority(const char *s, unsigned int *p) { unsigned int i, j; diff --git a/extensions/libxt_dccp.c b/extensions/libxt_dccp.c index b6818cc5..d794c2dd 100644 --- a/extensions/libxt_dccp.c +++ b/extensions/libxt_dccp.c @@ -81,7 +81,7 @@ parse_dccp_ports(const char *portstring, free(buffer); } -static char *dccp_pkt_types[] = { +static const char *const dccp_pkt_types[] = { [DCCP_PKT_REQUEST] = "REQUEST", [DCCP_PKT_RESPONSE] = "RESPONSE", [DCCP_PKT_DATA] = "DATA", diff --git a/extensions/libxt_hashlimit.c b/extensions/libxt_hashlimit.c index fdd8cebe..a641bb4d 100644 --- a/extensions/libxt_hashlimit.c +++ b/extensions/libxt_hashlimit.c @@ -249,7 +249,7 @@ static void final_check(unsigned int flags) "You have to specify --hashlimit-name"); } -static struct rates +static const struct rates { const char *name; u_int32_t mult; diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c index 13468eba..d0fd7bcf 100644 --- a/extensions/libxt_limit.c +++ b/extensions/libxt_limit.c @@ -126,7 +126,7 @@ parse(int c, char **argv, int invert, unsigned int *flags, return 1; } -static struct rates +static const struct rates { const char *name; u_int32_t mult; diff --git a/extensions/libxt_sctp.c b/extensions/libxt_sctp.c index 2768ca59..634862b6 100644 --- a/extensions/libxt_sctp.c +++ b/extensions/libxt_sctp.c @@ -110,7 +110,7 @@ struct sctp_chunk_names { }; /*'ALL' and 'NONE' will be treated specially. */ -static struct sctp_chunk_names sctp_chunk_names[] +static const struct sctp_chunk_names sctp_chunk_names[] = { { .name = "DATA", .chunk_type = 0, .valid_flags = "-----UBE"}, { .name = "INIT", .chunk_type = 1, .valid_flags = "--------"}, { .name = "INIT_ACK", .chunk_type = 2, .valid_flags = "--------"}, diff --git a/extensions/libxt_tcp.c b/extensions/libxt_tcp.c index 6ab0e225..ed076678 100644 --- a/extensions/libxt_tcp.c +++ b/extensions/libxt_tcp.c @@ -66,7 +66,7 @@ struct tcp_flag_names { unsigned int flag; }; -static struct tcp_flag_names tcp_flag_names[] +static const struct tcp_flag_names tcp_flag_names[] = { { "FIN", 0x01 }, { "SYN", 0x02 }, { "RST", 0x04 }, -- cgit v1.2.3