anonfunc/xtables-addons
1
0
Fork 0
mirror of git://git.code.sf.net/p/xtables-addons/xtables-addons synced 2025-09-20 11:34:57 +02:00
Code Issues Releases Wiki Activity

ipset: fixup compile warnings

Browse Source 
And add a few const here and there.
This commit is contained in:
Jan Engelhardt
2008-07-07 10:36:35 +02:00
parent 9d696b727a
commit 29aea5a87b
11 changed files with 157 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
extensions/ipset/ipset_iptree.c
View File

@@ -31,7 +31,7 @@
#define OPT_CREATE_TIMEOUT 0x01U
/* Initialize the create. */
void create_init(void *data)
static void create_init(void *data)
{
struct ip_set_req_iptree_create *mydata =
(struct ip_set_req_iptree_create *) data;
@@ -41,7 +41,7 @@ void create_init(void *data)
}
/* Function which parses command options; returns true if it ate an option */
int create_parse(int c, char *argv[], void *data, unsigned *flags)
static int create_parse(int c, char *argv[], void *data, unsigned int *flags)
{
struct ip_set_req_iptree_create *mydata =
(struct ip_set_req_iptree_create *) data;
@@ -65,25 +65,25 @@ int create_parse(int c, char *argv[], void *data, unsigned *flags)
}
/* Final check; exit if not ok. */
void create_final(void *data, unsigned int flags)
static void create_final(void *data, unsigned int flags)
{
}
/* Create commandline options */
static struct option create_opts[] = {
static const struct option create_opts[] = {
{"timeout", 1, 0, '1'},
{0}
{NULL},
};
/* Add, del, test parser */
ip_set_ip_t adt_parser(unsigned cmd, const char *optarg, void *data)
static ip_set_ip_t adt_parser(unsigned int cmd, const char *arg, void *data)
{
struct ip_set_req_iptree *mydata =
(struct ip_set_req_iptree *) data;
char *saved = ipset_strdup(optarg);
char *saved = ipset_strdup(arg);
char *ptr, *tmp = saved;
DP("iptree: %p %p", optarg, data);
DP("iptree: %p %p", arg, data);
ptr = strsep(&tmp, ":%");
parse_ip(ptr, &mydata->ip);
@@ -101,7 +101,7 @@ ip_set_ip_t adt_parser(unsigned cmd, const char *optarg, void *data)
* Print and save
*/
void initheader(struct set *set, const void *data)
static void initheader(struct set *set, const void *data)
{
struct ip_set_req_iptree_create *header =
(struct ip_set_req_iptree_create *) data;
@@ -111,7 +111,7 @@ void initheader(struct set *set, const void *data)
map->timeout = header->timeout;
}
void printheader(struct set *set, unsigned options)
static void printheader(struct set *set, unsigned int options)
{
struct ip_set_iptree *mysetdata =
(struct ip_set_iptree *) set->settype->header;
@@ -121,7 +121,8 @@ void printheader(struct set *set, unsigned options)
printf("\n");
}
void printips_sorted(struct set *set, void *data, size_t len, unsigned options)
static void printips_sorted(struct set *set, void *data, size_t len,
unsigned int options)
{
struct ip_set_iptree *mysetdata =
(struct ip_set_iptree *) set->settype->header;
@@ -139,7 +140,7 @@ void printips_sorted(struct set *set, void *data, size_t len, unsigned options)
}
}
void saveheader(struct set *set, unsigned options)
static void saveheader(struct set *set, unsigned int options)
{
struct ip_set_iptree *mysetdata =
(struct ip_set_iptree *) set->settype->header;
@@ -153,7 +154,8 @@ void saveheader(struct set *set, unsigned options)
set->name, set->settype->typename);
}
void saveips(struct set *set, void *data, size_t len, unsigned options)
static void saveips(struct set *set, void *data, size_t len,
unsigned int options)
{
struct ip_set_iptree *mysetdata =
(struct ip_set_iptree *) set->settype->header;
@@ -177,7 +179,7 @@ void saveips(struct set *set, void *data, size_t len, unsigned options)
}
}
void usage(void)
static void usage(void)
{
printf
("-N set iptree [--timeout value]\n"