| Message ID | 7e3bd531e4e10878c9fb009595a4721d77c6993c.1576255051.git.dcaratti@redhat.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | Matthieu Baerts |
| Headers | show |
| Series | [v2] squash-to: "mptcp: add basic kselftest for mptcp" | expand |
On Fri, 2019-12-13 at 17:38 +0100, Davide Caratti wrote: > checkpatch fixes > > Signed-off-by: Davide Caratti <dcaratti@redhat.com> > --- > .../selftests/net/mptcp/mptcp_connect.c | 26 +++++++++---------- > 1 file changed, 12 insertions(+), 14 deletions(-) > > diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c > index 8b8718e150d1..a3dccd816ae4 100644 > --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c > +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c > @@ -71,7 +71,8 @@ static void xgetnameinfo(const struct sockaddr *addr, socklen_t addrlen, > char *serv, socklen_t servlen) > { > int flags = NI_NUMERICHOST | NI_NUMERICSERV; > - int err = getnameinfo(addr, addrlen, host, hostlen, serv, servlen, flags); > + int err = getnameinfo(addr, addrlen, host, hostlen, serv, servlen, > + flags); > > if (err) { > const char *errstr = getxinfo_strerr(err); > @@ -161,7 +162,6 @@ static int sock_listen_mptcp(const char * const listenaddr, > static bool sock_test_tcpulp(const char * const remoteaddr, > const char * const port) > { > - > struct addrinfo hints = { > .ai_protocol = IPPROTO_TCP, > .ai_socktype = SOCK_STREAM, > @@ -281,11 +281,12 @@ static ssize_t do_rnd_read(const int fd, char *buf, const size_t len) > > static void set_nonblock(int fd) > { > - int flags = fcntl(fd, F_GETFL); > - if (flags == -1) > - return; > + int flags = fcntl(fd, F_GETFL); > + > + if (flags == -1) > + return; > > - fcntl(fd, F_SETFL, flags | O_NONBLOCK); > + fcntl(fd, F_SETFL, flags | O_NONBLOCK); > } > > static int copyfd_io_poll(int infd, int peerfd, int outfd) > @@ -478,7 +479,7 @@ static int do_sendfile(int infd, int outfd, unsigned int count) > } > > static int copyfd_io_mmap(int infd, int peerfd, int outfd, > - unsigned int size) > + unsigned int size) > { > int err; > > @@ -501,7 +502,6 @@ static int copyfd_io_mmap(int infd, int peerfd, int outfd, > return err; > } > > - > static int copyfd_io_sendfile(int infd, int peerfd, int outfd, > unsigned int size) > { > @@ -575,11 +575,11 @@ static void check_sockaddr(int pf, struct sockaddr_storage *ss, > > if (salen != wanted_size) > fprintf(stderr, "accept: size mismatch, got %d expected %d\n", > - (int)salen, wanted_size); > + (int)salen, wanted_size); > > if (ss->ss_family != pf) > fprintf(stderr, "accept: pf mismatch, expect %d, ss_family is %d\n", > - (int)ss->ss_family, pf); > + (int)ss->ss_family, pf); > } > > static void check_getpeername(int fd, struct sockaddr_storage *ss, socklen_t salen) > @@ -746,15 +746,13 @@ int parse_sndbuf(const char *size) > > if (errno) { > fprintf(stderr, "Invalid sndbuf size %s (%s)\n", > - size, > - strerror(errno)); > + size, strerror(errno)); > die_usage(); > } > > if (s > INT_MAX) { > fprintf(stderr, "Invalid sndbuf size %s (%s)\n", > - size, > - strerror(ERANGE)); > + size, strerror(ERANGE)); > die_usage(); > } > ACK! /P
diff --git a/tools/testing/selftests/net/mptcp/mptcp_connect.c b/tools/testing/selftests/net/mptcp/mptcp_connect.c index 8b8718e150d1..a3dccd816ae4 100644 --- a/tools/testing/selftests/net/mptcp/mptcp_connect.c +++ b/tools/testing/selftests/net/mptcp/mptcp_connect.c @@ -71,7 +71,8 @@ static void xgetnameinfo(const struct sockaddr *addr, socklen_t addrlen, char *serv, socklen_t servlen) { int flags = NI_NUMERICHOST | NI_NUMERICSERV; - int err = getnameinfo(addr, addrlen, host, hostlen, serv, servlen, flags); + int err = getnameinfo(addr, addrlen, host, hostlen, serv, servlen, + flags); if (err) { const char *errstr = getxinfo_strerr(err); @@ -161,7 +162,6 @@ static int sock_listen_mptcp(const char * const listenaddr, static bool sock_test_tcpulp(const char * const remoteaddr, const char * const port) { - struct addrinfo hints = { .ai_protocol = IPPROTO_TCP, .ai_socktype = SOCK_STREAM, @@ -281,11 +281,12 @@ static ssize_t do_rnd_read(const int fd, char *buf, const size_t len) static void set_nonblock(int fd) { - int flags = fcntl(fd, F_GETFL); - if (flags == -1) - return; + int flags = fcntl(fd, F_GETFL); + + if (flags == -1) + return; - fcntl(fd, F_SETFL, flags | O_NONBLOCK); + fcntl(fd, F_SETFL, flags | O_NONBLOCK); } static int copyfd_io_poll(int infd, int peerfd, int outfd) @@ -478,7 +479,7 @@ static int do_sendfile(int infd, int outfd, unsigned int count) } static int copyfd_io_mmap(int infd, int peerfd, int outfd, - unsigned int size) + unsigned int size) { int err; @@ -501,7 +502,6 @@ static int copyfd_io_mmap(int infd, int peerfd, int outfd, return err; } - static int copyfd_io_sendfile(int infd, int peerfd, int outfd, unsigned int size) { @@ -575,11 +575,11 @@ static void check_sockaddr(int pf, struct sockaddr_storage *ss, if (salen != wanted_size) fprintf(stderr, "accept: size mismatch, got %d expected %d\n", - (int)salen, wanted_size); + (int)salen, wanted_size); if (ss->ss_family != pf) fprintf(stderr, "accept: pf mismatch, expect %d, ss_family is %d\n", - (int)ss->ss_family, pf); + (int)ss->ss_family, pf); } static void check_getpeername(int fd, struct sockaddr_storage *ss, socklen_t salen) @@ -746,15 +746,13 @@ int parse_sndbuf(const char *size) if (errno) { fprintf(stderr, "Invalid sndbuf size %s (%s)\n", - size, - strerror(errno)); + size, strerror(errno)); die_usage(); } if (s > INT_MAX) { fprintf(stderr, "Invalid sndbuf size %s (%s)\n", - size, - strerror(ERANGE)); + size, strerror(ERANGE)); die_usage(); }
checkpatch fixes Signed-off-by: Davide Caratti <dcaratti@redhat.com> --- .../selftests/net/mptcp/mptcp_connect.c | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-)