matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

scrub out whitespace issues 

Run script that removes trailing whitespace everywhere.
This commit is contained in:
Stephen Hemminger 2016-03-27 10:47:46 -07:00
parent 334af76143
commit e9e9365b56
17 changed files with 31 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bridge/monitor.c
View File

@ -142,4 +142,3 @@ int do_monitor(int argc, char **argv)
return 0; return 0;
} }

32
include/libnetlink.h
View File

@ -11,8 +11,7 @@
#include <linux/neighbour.h> #include <linux/neighbour.h>
#include <linux/netconf.h> #include <linux/netconf.h>
struct rtnl_handle struct rtnl_handle {
{
int fd; int fd;
struct sockaddr_nl local; struct sockaddr_nl local;
struct sockaddr_nl peer; struct sockaddr_nl peer;
@ -26,10 +25,10 @@ struct rtnl_handle
extern int rcvbuf; extern int rcvbuf;
int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions) int rtnl_open(struct rtnl_handle *rth, unsigned int subscriptions)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions, int rtnl_open_byproto(struct rtnl_handle *rth, unsigned int subscriptions,
int protocol) int protocol)
__attribute__((warn_unused_result)); __attribute__((warn_unused_result));
@ -56,8 +55,7 @@ typedef int (*rtnl_listen_filter_t)(const struct sockaddr_nl *,
struct rtnl_ctrl_data *, struct rtnl_ctrl_data *,
struct nlmsghdr *n, void *); struct nlmsghdr *n, void *);
struct rtnl_dump_filter_arg struct rtnl_dump_filter_arg {
{
rtnl_filter_t filter; rtnl_filter_t filter;
void *arg1; void *arg1;
__u16 nc_flags; __u16 nc_flags;
@ -140,6 +138,7 @@ static inline __u32 rta_getattr_u32(const struct rtattr *rta)
static inline __u64 rta_getattr_u64(const struct rtattr *rta) static inline __u64 rta_getattr_u64(const struct rtattr *rta)
{ {
__u64 tmp; __u64 tmp;
memcpy(&tmp, RTA_DATA(rta), sizeof(__u64)); memcpy(&tmp, RTA_DATA(rta), sizeof(__u64));
return tmp; return tmp;
} }
@ -159,42 +158,42 @@ int rtnl_from_file(FILE *, rtnl_listen_filter_t handler,
#ifndef IFA_RTA #ifndef IFA_RTA
#define IFA_RTA(r) \ #define IFA_RTA(r) \
((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg)))) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
#endif #endif
#ifndef IFA_PAYLOAD #ifndef IFA_PAYLOAD
#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg)) #define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ifaddrmsg))
#endif #endif
#ifndef IFLA_RTA #ifndef IFLA_RTA
#define IFLA_RTA(r) \ #define IFLA_RTA(r) \
((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg)))) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
#endif #endif
#ifndef IFLA_PAYLOAD #ifndef IFLA_PAYLOAD
#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg)) #define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg))
#endif #endif
#ifndef NDA_RTA #ifndef NDA_RTA
#define NDA_RTA(r) \ #define NDA_RTA(r) \
((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg)))) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
#endif #endif
#ifndef NDA_PAYLOAD #ifndef NDA_PAYLOAD
#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg)) #define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ndmsg))
#endif #endif
#ifndef NDTA_RTA #ifndef NDTA_RTA
#define NDTA_RTA(r) \ #define NDTA_RTA(r) \
((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg)))) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg))))
#endif #endif
#ifndef NDTA_PAYLOAD #ifndef NDTA_PAYLOAD
#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg)) #define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ndtmsg))
#endif #endif
#ifndef NETNS_RTA #ifndef NETNS_RTA
#define NETNS_RTA(r) \ #define NETNS_RTA(r) \
((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg)))) ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg))))
#endif #endif
#ifndef NETNS_PAYLOAD #ifndef NETNS_PAYLOAD
#define NETNS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtgenmsg)) #define NETNS_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct rtgenmsg))
#endif #endif
/* User defined nlmsg_type which is used mostly for logging netlink /* User defined nlmsg_type which is used mostly for logging netlink
@ -202,4 +201,3 @@ int rtnl_from_file(FILE *, rtnl_listen_filter_t handler,
#define NLMSG_TSTAMP 15 #define NLMSG_TSTAMP 15
#endif /* __LIBNETLINK_H__ */ #endif /* __LIBNETLINK_H__ */

2
lib/coverity_model.c
View File

@ -15,5 +15,3 @@
* Coverity Scan doesn't pick up modifications automatically. The model file * Coverity Scan doesn't pick up modifications automatically. The model file
* must be uploaded by an admin. * must be uploaded by an admin.
*/ */

2
lib/dnet_ntop.c
View File

@ -98,5 +98,3 @@ const char *dnet_ntop(int af, const void *addr, char *str, size_t len)
return NULL; return NULL;
} }

2
lib/inet_proto.c
View File

@ -67,5 +67,3 @@ int inet_proto_a2n(const char *buf)
} }
return -1; return -1;
} }

2
lib/ipx_ntop.c
View File

@ -68,5 +68,3 @@ const char *ipx_ntop(int af, const void *addr, char *str, size_t len)
return NULL; return NULL;
} }

1
lib/libgenl.c
View File

@ -60,4 +60,3 @@ int genl_resolve_family(struct rtnl_handle *grth, const char *family)
return genl_parse_getfamily(&req.n); return genl_parse_getfamily(&req.n);
} }