emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- make the first arg of the filter function passed to rtnl_dump_filter constant

Browse Source 
to match normal iproute. No obj-code changes.
This commit is contained in:
Bernhard Reutner-Fischer 2008-06-12 15:54:49 +00:00
parent 7e3d33b6ce
commit 9de4622055
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
networking/libiproute/ipaddress.c
View File

@ -196,7 +196,7 @@ static int flush_update(void)
return 0; return 0;
} }
static int print_addrinfo(struct sockaddr_nl *who ATTRIBUTE_UNUSED, static int print_addrinfo(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED) struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED)
{ {
struct ifaddrmsg *ifa = NLMSG_DATA(n); struct ifaddrmsg *ifa = NLMSG_DATA(n);
@ -380,7 +380,7 @@ static int print_selected_addrinfo(int ifindex, struct nlmsg_list *ainfo)
} }
static int store_nlmsg(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg) static int store_nlmsg(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg)
{ {
struct nlmsg_list **linfo = (struct nlmsg_list**)arg; struct nlmsg_list **linfo = (struct nlmsg_list**)arg;
struct nlmsg_list *h; struct nlmsg_list *h;

2
networking/libiproute/iproute.c
View File

@ -78,7 +78,7 @@ static unsigned get_hz(void)
return hz_internal; return hz_internal;
} }
static int print_route(struct sockaddr_nl *who ATTRIBUTE_UNUSED, static int print_route(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
struct nlmsghdr *n, void *arg) struct nlmsghdr *n, void *arg)
{ {
FILE *fp = (FILE*)arg; FILE *fp = (FILE*)arg;

2
networking/libiproute/iprule.c
View File

@ -40,7 +40,7 @@ static void usage(void)
} }
*/ */
static int print_rule(struct sockaddr_nl *who ATTRIBUTE_UNUSED, static int print_rule(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED) struct nlmsghdr *n, void *arg ATTRIBUTE_UNUSED)
{ {
struct rtmsg *r = NLMSG_DATA(n); struct rtmsg *r = NLMSG_DATA(n);

6
networking/libiproute/libnetlink.c
View File

@ -103,7 +103,7 @@ int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len)
} }
static int rtnl_dump_filter(struct rtnl_handle *rth, static int rtnl_dump_filter(struct rtnl_handle *rth,
int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *), int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *n, void *),
void *arg1/*, void *arg1/*,
int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *), int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *),
void *arg2*/) void *arg2*/)
@ -195,7 +195,7 @@ static int rtnl_dump_filter(struct rtnl_handle *rth,
} }
int xrtnl_dump_filter(struct rtnl_handle *rth, int xrtnl_dump_filter(struct rtnl_handle *rth,
int (*filter)(struct sockaddr_nl *, struct nlmsghdr *n, void *), int (*filter)(const struct sockaddr_nl *, struct nlmsghdr *, void *),
void *arg1) void *arg1)
{ {
int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/); int ret = rtnl_dump_filter(rth, filter, arg1/*, NULL, NULL*/);
@ -207,7 +207,7 @@ int xrtnl_dump_filter(struct rtnl_handle *rth,
int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n,
pid_t peer, unsigned groups, pid_t peer, unsigned groups,
struct nlmsghdr *answer, struct nlmsghdr *answer,
int (*junk)(struct sockaddr_nl *, struct nlmsghdr *n, void *), int (*junk)(struct sockaddr_nl *, struct nlmsghdr *, void *),
void *jarg) void *jarg)
{ {
/* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */ /* bbox doesn't use parameters no. 3, 4, 6, 7, they are stubbed out */

2
networking/libiproute/libnetlink.h
View File

@ -27,7 +27,7 @@ extern void rtnl_close(struct rtnl_handle *rth);
extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type); extern int xrtnl_wilddump_request(struct rtnl_handle *rth, int fam, int type);
extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len); extern int rtnl_dump_request(struct rtnl_handle *rth, int type, void *req, int len);
extern int xrtnl_dump_filter(struct rtnl_handle *rth, extern int xrtnl_dump_filter(struct rtnl_handle *rth,
int (*filter)(struct sockaddr_nl*, struct nlmsghdr *n, void*), int (*filter)(const struct sockaddr_nl*, struct nlmsghdr *n, void*),
void *arg1); void *arg1);
/* bbox doesn't use parameters no. 3, 4, 6, 7, stub them out */ /* bbox doesn't use parameters no. 3, 4, 6, 7, stub them out */

2
networking/libiproute/ll_map.c
View File

@ -39,7 +39,7 @@ static struct idxmap *find_by_index(int idx)
return NULL; return NULL;
} }
int ll_remember_index(struct sockaddr_nl *who ATTRIBUTE_UNUSED, int ll_remember_index(const struct sockaddr_nl *who ATTRIBUTE_UNUSED,
struct nlmsghdr *n, struct nlmsghdr *n,
void *arg ATTRIBUTE_UNUSED) void *arg ATTRIBUTE_UNUSED)
{ {

2
networking/libiproute/ll_map.h
View File

@ -6,7 +6,7 @@
# pragma GCC visibility push(hidden) # pragma GCC visibility push(hidden)
#endif #endif
int ll_remember_index(struct sockaddr_nl *who, struct nlmsghdr *n, void *arg); int ll_remember_index(const struct sockaddr_nl *who, struct nlmsghdr *n, void *arg);
int ll_init_map(struct rtnl_handle *rth); int ll_init_map(struct rtnl_handle *rth);
int xll_name_to_index(const char *const name); int xll_name_to_index(const char *const name);
const char *ll_index_to_name(int idx); const char *ll_index_to_name(int idx);