From: Stephen Hemminger Date: Fri, 13 Jan 2017 01:29:41 +0000 (-0800) Subject: whitespace cleanup X-Git-Tag: v4.10.0~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3bad1dbb2065bf40b7a561fef751ce96f1d2b122;p=thirdparty%2Fiproute2.git whitespace cleanup Get rid of blanks at end of line and extra lines at eof Signed-off-by: Stephen Hemminger --- diff --git a/bridge/Makefile b/bridge/Makefile index 7203f70bc..634c370a3 100644 --- a/bridge/Makefile +++ b/bridge/Makefile @@ -8,7 +8,7 @@ endif all: bridge -bridge: $(BROBJ) $(LIBNETLINK) +bridge: $(BROBJ) $(LIBNETLINK) $(QUIET_LINK)$(CC) $^ $(LDFLAGS) $(LDLIBS) -o $@ install: all @@ -16,4 +16,3 @@ install: all clean: rm -f $(BROBJ) bridge - diff --git a/etc/iproute2/nl_protos b/etc/iproute2/nl_protos index 43418f36f..7c17cf0f9 100644 --- a/etc/iproute2/nl_protos +++ b/etc/iproute2/nl_protos @@ -12,7 +12,7 @@ 9 audit 10 fiblookup 11 connector -12 nft +12 nft 13 ip6fw 14 dec-rt 15 uevent @@ -20,4 +20,4 @@ 18 scsi-trans 19 ecryptfs 20 rdma -21 crypto +21 crypto diff --git a/lib/Makefile b/lib/Makefile index 0c57662b4..1d24ca24b 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -24,4 +24,3 @@ install: clean: rm -f $(NLOBJ) $(UTILOBJ) $(ADDLIB) libnetlink.a libutil.a - diff --git a/man/man3/libnetlink.3 b/man/man3/libnetlink.3 index 99be9cc9f..8e3dc6202 100644 --- a/man/man3/libnetlink.3 +++ b/man/man3/libnetlink.3 @@ -32,12 +32,12 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, .br void *jarg) .sp -int rtnl_listen(struct rtnl_handle *rtnl, +int rtnl_listen(struct rtnl_handle *rtnl, int (*handler)(struct sockaddr_nl *, struct rtnl_ctrl_data *, struct nlmsghdr *n, void *), void *jarg) .sp -int rtnl_from_file(FILE *rtnl, +int rtnl_from_file(FILE *rtnl, int (*handler)(struct sockaddr_nl *,struct nlmsghdr *n, void *), void *jarg) .sp @@ -49,35 +49,35 @@ int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data) .sp int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen) .SH DESCRIPTION -libnetlink provides a higher level interface to -.BR rtnetlink(7). +libnetlink provides a higher level interface to +.BR rtnetlink(7). The read functions return 0 on success and a negative errno on failure. The send functions return the amount of data sent, or -1 on error. -.TP +.TP rtnl_open Open a rtnetlink socket and save the state into the .B rth -handle. This handle is passed to all subsequent calls. +handle. This handle is passed to all subsequent calls. .B subscriptions is a bitmap of the rtnetlink multicast groups the socket will be a member of. .TP rtnl_wilddump_request -Request a full dump of the +Request a full dump of the .B type database for .B family addresses. .B type -is a rtnetlink message type. +is a rtnetlink message type. .\" XXX .TP rtnl_dump_request -Request a full dump of the -.B type -data buffer into +Request a full dump of the +.B type +data buffer into .B buf with maximum length of .B len. @@ -91,12 +91,12 @@ The .B filter callback checks if the received message is wanted. It gets the source address of the message, the message itself and -.B arg1 +.B arg1 as arguments. 0 as return means that the filter passed, a negative value is returned by -.I rtnl_dump_filter -in case of error. NULL for +.I rtnl_dump_filter +in case of error. NULL for .I filter means to not use a filter. .B junk @@ -106,7 +106,7 @@ pending, this function does not block. .TP rtnl_listen -Receive netlink data after a request and pass it to +Receive netlink data after a request and pass it to .I handler. .B handler is a callback that gets the message source address, anscillary data, the message @@ -118,8 +118,8 @@ pending this function does not block. .TP rtnl_from_file -Works like -.I rtnl_listen, +Works like +.I rtnl_listen, but reads a netlink message bundle from the file .B file and passes the messages to @@ -134,7 +134,7 @@ and .BR netlink(3) on how to generate a rtnetlink message. The following utility functions require a continuous buffer that already contains a netlink message header -and a rtnetlink request. +and a rtnetlink request. .TP rtnl_send @@ -168,7 +168,7 @@ length to netlink message .B n, which is part of a buffer of length .B maxlen. -.B data +.B data is copied. .TP diff --git a/man/man8/.gitignore b/man/man8/.gitignore index 4f1a476d4..0c3d15047 100644 --- a/man/man8/.gitignore +++ b/man/man8/.gitignore @@ -2,4 +2,3 @@ ip-address.8 ip-link.8 ip-route.8 - diff --git a/netem/Makefile b/netem/Makefile index e52e125e3..a68e2fdb3 100644 --- a/netem/Makefile +++ b/netem/Makefile @@ -3,7 +3,7 @@ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist HOSTCC ?= $(CC) CCOPTS = $(CBUILD_CFLAGS) -LDLIBS += -lm +LDLIBS += -lm all: $(DISTGEN) $(DISTDATA)