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_macipmap.c
View File

@@ -40,14 +40,14 @@
#define OPT_ADDDEL_MAC 0x02U
/* Initialize the create. */
void create_init(void *data)
static void create_init(void *data)
{
DP("create INIT");
/* Nothing */
}
/* 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_macipmap_create *mydata =
(struct ip_set_req_macipmap_create *) data;
@@ -107,7 +107,7 @@ 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)
{
struct ip_set_req_macipmap_create *mydata =
(struct ip_set_req_macipmap_create *) data;
@@ -145,12 +145,12 @@ void create_final(void *data, unsigned int flags)
}
/* Create commandline options */
static struct option create_opts[] = {
static const struct option create_opts[] = {
{"from", 1, 0, '1'},
{"to", 1, 0, '2'},
{"network", 1, 0, '3'},
{"matchunset", 0, 0, '4'},
{0}
{NULL},
};
static void parse_mac(const char *mac, unsigned char *ethernet)
@@ -175,14 +175,14 @@ static void parse_mac(const char *mac, unsigned char *ethernet)
}
/* 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_macipmap *mydata =
(struct ip_set_req_macipmap *) data;
char *saved = ipset_strdup(optarg);
char *saved = ipset_strdup(arg);
char *ptr, *tmp = saved;
DP("macipmap: %p %p", optarg, data);
DP("macipmap: %p %p", arg, data);
ptr = strsep(&tmp, ":%");
parse_ip(ptr, &mydata->ip);
@@ -200,7 +200,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_macipmap_create *header =
(struct ip_set_req_macipmap_create *) data;
@@ -213,7 +213,7 @@ void initheader(struct set *set, const void *data)
map->flags = header->flags;
}
void printheader(struct set *set, unsigned options)
static void printheader(struct set *set, unsigned int options)
{
struct ip_set_macipmap *mysetdata =
(struct ip_set_macipmap *) set->settype->header;
@@ -235,7 +235,8 @@ static void print_mac(unsigned char macaddress[ETH_ALEN])
printf(":%02X", macaddress[i]);
}
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_macipmap *mysetdata =
(struct ip_set_macipmap *) set->settype->header;
@@ -255,7 +256,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_macipmap *mysetdata =
(struct ip_set_macipmap *) set->settype->header;
@@ -270,7 +271,8 @@ void saveheader(struct set *set, unsigned options)
printf("\n");
}
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_macipmap *mysetdata =
(struct ip_set_macipmap *) set->settype->header;
@@ -291,7 +293,7 @@ void saveips(struct set *set, void *data, size_t len, unsigned options)
}
}
void usage(void)
static void usage(void)
{
printf
("-N set macipmap --from IP --to IP [--matchunset]\n"