scrub out whitespace issues
Run script that removes trailing whitespace everywhere.
diff --git a/bridge/fdb.c b/bridge/fdb.c
index e8c314a..df55e86 100644
--- a/bridge/fdb.c
+++ b/bridge/fdb.c
@@ -298,7 +298,7 @@
req.ndm.ndm_flags |= NTF_MASTER;
} else if (matches(*argv, "router") == 0) {
req.ndm.ndm_flags |= NTF_ROUTER;
- } else if (matches(*argv, "local") == 0 ||
+ } else if (matches(*argv, "local") == 0 ||
matches(*argv, "permanent") == 0) {
req.ndm.ndm_state |= NUD_PERMANENT;
} else if (matches(*argv, "temp") == 0 ||
diff --git a/bridge/monitor.c b/bridge/monitor.c
index 6269081..d294269 100644
--- a/bridge/monitor.c
+++ b/bridge/monitor.c
@@ -142,4 +142,3 @@
return 0;
}
-
diff --git a/genl/ctrl.c b/genl/ctrl.c
index b7a8878..ffa34af 100644
--- a/genl/ctrl.c
+++ b/genl/ctrl.c
@@ -132,7 +132,7 @@
fprintf(fp, "\n");
}
-
+
static int print_ctrl_cmds(FILE *fp, struct rtattr *arg, __u32 ctrl_ver)
{
struct rtattr *tb[CTRL_ATTR_OP_MAX + 1];
diff --git a/include/libnetlink.h b/include/libnetlink.h
index 431189e..491263f 100644
--- a/include/libnetlink.h
+++ b/include/libnetlink.h
@@ -11,8 +11,7 @@
#include <linux/neighbour.h>
#include <linux/netconf.h>
-struct rtnl_handle
-{
+struct rtnl_handle {
int fd;
struct sockaddr_nl local;
struct sockaddr_nl peer;
@@ -26,10 +25,10 @@
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));
-int rtnl_open_byproto(struct rtnl_handle *rth, unsigned subscriptions,
+int rtnl_open_byproto(struct rtnl_handle *rth, unsigned int subscriptions,
int protocol)
__attribute__((warn_unused_result));
@@ -56,8 +55,7 @@
struct rtnl_ctrl_data *,
struct nlmsghdr *n, void *);
-struct rtnl_dump_filter_arg
-{
+struct rtnl_dump_filter_arg {
rtnl_filter_t filter;
void *arg1;
__u16 nc_flags;
@@ -140,6 +138,7 @@
static inline __u64 rta_getattr_u64(const struct rtattr *rta)
{
__u64 tmp;
+
memcpy(&tmp, RTA_DATA(rta), sizeof(__u64));
return tmp;
}
@@ -159,42 +158,42 @@
#ifndef IFA_RTA
#define IFA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
+ ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifaddrmsg))))
#endif
#ifndef IFA_PAYLOAD
-#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifaddrmsg))
+#define IFA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ifaddrmsg))
#endif
#ifndef IFLA_RTA
#define IFLA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
+ ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ifinfomsg))))
#endif
#ifndef IFLA_PAYLOAD
-#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ifinfomsg))
+#define IFLA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ifinfomsg))
#endif
#ifndef NDA_RTA
#define NDA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
+ ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ndmsg))))
#endif
#ifndef NDA_PAYLOAD
-#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndmsg))
+#define NDA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ndmsg))
#endif
#ifndef NDTA_RTA
#define NDTA_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg))))
+ ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct ndtmsg))))
#endif
#ifndef NDTA_PAYLOAD
-#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct ndtmsg))
+#define NDTA_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct ndtmsg))
#endif
#ifndef NETNS_RTA
#define NETNS_RTA(r) \
- ((struct rtattr*)(((char*)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg))))
+ ((struct rtattr *)(((char *)(r)) + NLMSG_ALIGN(sizeof(struct rtgenmsg))))
#endif
#ifndef NETNS_PAYLOAD
-#define NETNS_PAYLOAD(n) NLMSG_PAYLOAD(n,sizeof(struct rtgenmsg))
+#define NETNS_PAYLOAD(n) NLMSG_PAYLOAD(n, sizeof(struct rtgenmsg))
#endif
/* User defined nlmsg_type which is used mostly for logging netlink
@@ -202,4 +201,3 @@
#define NLMSG_TSTAMP 15
#endif /* __LIBNETLINK_H__ */
-
diff --git a/lib/coverity_model.c b/lib/coverity_model.c
index c896302..1321fe8 100644
--- a/lib/coverity_model.c
+++ b/lib/coverity_model.c
@@ -15,5 +15,3 @@
* Coverity Scan doesn't pick up modifications automatically. The model file
* must be uploaded by an admin.
*/
-
-
diff --git a/lib/dnet_ntop.c b/lib/dnet_ntop.c
index 507a7eb..112dc0d 100644
--- a/lib/dnet_ntop.c
+++ b/lib/dnet_ntop.c
@@ -98,5 +98,3 @@
return NULL;
}
-
-
diff --git a/lib/inet_proto.c b/lib/inet_proto.c
index 57a8351..ceda082 100644
--- a/lib/inet_proto.c
+++ b/lib/inet_proto.c
@@ -67,5 +67,3 @@
}
return -1;
}
-
-
diff --git a/lib/ipx_ntop.c b/lib/ipx_ntop.c
index 1e46bc2..5f646b3 100644
--- a/lib/ipx_ntop.c
+++ b/lib/ipx_ntop.c
@@ -68,5 +68,3 @@
return NULL;
}
-
-
diff --git a/lib/libgenl.c b/lib/libgenl.c
index acb1478..a1a37a4 100644
--- a/lib/libgenl.c
+++ b/lib/libgenl.c
@@ -60,4 +60,3 @@
return genl_parse_getfamily(&req.n);
}
-
diff --git a/lib/libnetlink.c b/lib/libnetlink.c
index 245c4ca..a90e52c 100644
--- a/lib/libnetlink.c
+++ b/lib/libnetlink.c
@@ -158,7 +158,7 @@
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr)))
fprintf(stderr, "ERROR truncated\n");
- else
+ else
errno = -err->error;
return -1;
}
diff --git a/lib/utils.c b/lib/utils.c
index bd58427..b93b1dc 100644
--- a/lib/utils.c
+++ b/lib/utils.c
@@ -95,7 +95,7 @@
/* try coverting dotted quad to CIDR */
if (!get_addr_1(&addr, arg, AF_INET) && addr.family == AF_INET) {
int b = mask2bits(addr.data[0]);
-
+
if (b >= 0) {
*val = b;
return 0;
@@ -191,7 +191,7 @@
*val = t;
if (*val < t)
*val += 1;
-
+
return 0;
}
@@ -363,7 +363,7 @@
for (i = 0; i < 4; i++) {
unsigned long n;
char *endp;
-
+
n = strtoul(cp, &endp, 0);
if (n > 255)
return -1; /* bogus network value */
diff --git a/netem/maketable.c b/netem/maketable.c
index a5452b6..dc50532 100644
--- a/netem/maketable.c
+++ b/netem/maketable.c
@@ -210,7 +210,7 @@
}
} else {
fp = stdin;
- }
+ }
x = readdoubles(fp, &limit);
if (limit <= 0) {
fprintf(stderr, "Nothing much read!\n");
@@ -221,7 +221,7 @@
fprintf(stderr, "%d values, mu %10.4f, sigma %10.4f, rho %10.4f\n",
limit, mu, sigma, rho);
#endif
-
+
table = makedist(x, limit, mu, sigma);
free((void *) x);
cumulativedist(table, DISTTABLESIZE, &total);
diff --git a/netem/normal.c b/netem/normal.c
index dbdebb1..90963f4 100644
--- a/netem/normal.c
+++ b/netem/normal.c
@@ -33,7 +33,7 @@
table[i] = x;
}
-
+
printf("# This is the distribution table for the normal distribution.\n");
for (i = n = 0; i < TABLESIZE; i += 4) {
int value = (int) rint(table[i]*TABLEFACTOR);
diff --git a/netem/pareto.c b/netem/pareto.c
index 8aa647b..51d9437 100644
--- a/netem/pareto.c
+++ b/netem/pareto.c
@@ -36,6 +36,6 @@
n = 0;
}
}
-
+
return 0;
-}
+}
diff --git a/netem/paretonormal.c b/netem/paretonormal.c
index ed75f28..83ec87d 100644
--- a/netem/paretonormal.c
+++ b/netem/paretonormal.c
@@ -44,7 +44,7 @@
if (dvalue > 32767)
dvalue = 32767;
return (int)rint(dvalue);
-}
+}
int
main(int argc, char **argv)
diff --git a/tc/m_action.c b/tc/m_action.c
index 5c47c82..c416d98 100644
--- a/tc/m_action.c
+++ b/tc/m_action.c
@@ -141,9 +141,9 @@
new_cmd(char **argv)
{
if ((matches(*argv, "change") == 0) ||
- (matches(*argv, "replace") == 0) ||
- (matches(*argv, "delete") == 0) ||
- (matches(*argv, "get") == 0) ||
+ (matches(*argv, "replace") == 0) ||
+ (matches(*argv, "delete") == 0) ||
+ (matches(*argv, "get") == 0) ||
(matches(*argv, "add") == 0))
return 1;
diff --git a/tc/tc_core.c b/tc/tc_core.c
index 194028a..7bbe0d7 100644
--- a/tc/tc_core.c
+++ b/tc/tc_core.c
@@ -145,7 +145,7 @@
rtab[i] = tc_calc_xmittime(bps, sz);
}
- r->cell_align = -1;
+ r->cell_align = -1;
r->cell_log = cell_log;
r->linklayer = (linklayer & TC_LINKLAYER_MASK);
return cell_log;