ipset: fixup compile warnings

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

View File

@@ -28,7 +28,7 @@
#define OPT_CREATE_GC 0x1
void
static void
create_init(void *data)
{
struct ip_set_req_iptreemap_create *mydata = data;
@@ -36,7 +36,7 @@ create_init(void *data)
mydata->gc_interval = 0;
}
int
static int
create_parse(int c, char *argv[], void *data, unsigned int *flags)
{
struct ip_set_req_iptreemap_create *mydata = data;
@@ -55,23 +55,23 @@ create_parse(int c, char *argv[], void *data, unsigned int *flags)
return 1;
}
void
static void
create_final(void *data, unsigned int flags)
{
}
static struct option create_opts[] = {
static const struct option create_opts[] = {
{"gc", 1, 0, 'g'},
{0}
{NULL},
};
ip_set_ip_t
adt_parser(unsigned int 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_iptreemap *mydata = data;
ip_set_ip_t mask;
char *saved = ipset_strdup(optarg);
char *saved = ipset_strdup(arg);
char *ptr, *tmp = saved;
if (strchr(tmp, '/')) {
@@ -91,7 +91,7 @@ adt_parser(unsigned int cmd, const char *optarg, void *data)
return 1;
}
void
static void
initheader(struct set *set, const void *data)
{
const struct ip_set_req_iptreemap_create *header = data;
@@ -100,7 +100,7 @@ initheader(struct set *set, const void *data)
map->gc_interval = header->gc_interval;
}
void
static void
printheader(struct set *set, unsigned int options)
{
struct ip_set_iptreemap *mysetdata = set->settype->header;
@@ -111,7 +111,7 @@ printheader(struct set *set, unsigned int options)
printf("\n");
}
void
static void
printips_sorted(struct set *set, void *data, size_t len, unsigned int options)
{
struct ip_set_req_iptreemap *req;
@@ -129,7 +129,7 @@ printips_sorted(struct set *set, void *data, size_t len, unsigned int options)
}
}
void
static void
saveheader(struct set *set, unsigned int options)
{
struct ip_set_iptreemap *mysetdata = set->settype->header;
@@ -142,7 +142,7 @@ saveheader(struct set *set, unsigned int options)
printf("\n");
}
void
static void
saveips(struct set *set, void *data, size_t len, unsigned int options)
{
struct ip_set_req_iptreemap *req;
@@ -162,7 +162,7 @@ saveips(struct set *set, void *data, size_t len, unsigned int options)
}
}
void
static void
usage(void)
{
printf(