* use tabs (code indent should use tabs where possible, please, no spaces at the start of a line) * constant on second place in if() * missing a blank line after declarations Just few problems related to fix in the next commit, there are more if you run: $ ./scripts/checkpatch.pl -f --no-tree --terse --no-summary --ignore CONST_STRUCT,VOLATILE,SPLIT_STRING utils/sctp/testlib/sctputil.h Signed-off-by: Petr Vorel <pvorel@xxxxxxx> --- utils/sctp/testlib/sctputil.h | 100 +++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 31 deletions(-) diff --git a/utils/sctp/testlib/sctputil.h b/utils/sctp/testlib/sctputil.h index 6c3371c960..1e21760bec 100644 --- a/utils/sctp/testlib/sctputil.h +++ b/utils/sctp/testlib/sctputil.h @@ -133,64 +133,80 @@ extern int TST_CNT; static inline int test_socket(int domain, int type, int protocol) { int sk = socket(domain, type, protocol); - if (-1 == sk) - tst_brkm(TBROK, tst_exit, "socket: %s", strerror(errno)); + + if (sk == -1) + tst_brkm(TBROK, tst_exit, "socket: %s", strerror(errno)); + return sk; } static inline int test_bind(int sk, struct sockaddr *addr, socklen_t addrlen) { int error = bind(sk, addr, addrlen); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "bind: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "bind: %s", strerror(errno)); + return error; } static inline int test_bindx_add(int sk, struct sockaddr *addr, int count) { int error = sctp_bindx(sk, addr, count, SCTP_BINDX_ADD_ADDR); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "bindx (add): %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "bindx (add): %s", strerror(errno)); + return error; } static inline int test_listen(int sk, int backlog) { int error = listen(sk, backlog); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "listen: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "listen: %s", strerror(errno)); + return error; } static inline int test_connect(int sk, struct sockaddr *addr, socklen_t addrlen) { int error = connect(sk, addr, addrlen); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "connect: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "connect: %s", strerror(errno)); + return error; } static inline int test_connectx(int sk, struct sockaddr *addr, int count) { int error = sctp_connectx(sk, addr, count, NULL); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "connectx: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "connectx: %s", strerror(errno)); + return error; } static inline int test_accept(int sk, struct sockaddr *addr, socklen_t *addrlen) { int error = accept(sk, addr, addrlen); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "accept: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "accept: %s", strerror(errno)); + return error; } static inline int test_send(int sk, const void *msg, size_t len, int flags) { int error = send(sk, msg, len, flags); + if ((long)len != error) tst_brkm(TBROK, tst_exit, "send: error:%d errno:%d", error, errno); + return error; } @@ -198,8 +214,10 @@ static inline int test_sendto(int sk, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen) { int error = sendto(sk, msg, len, flags, to, tolen); + if ((long)len != error) tst_brkm(TBROK, tst_exit, "sendto: error:%d errno:%d", error, errno); + return error; } @@ -207,33 +225,40 @@ static inline int test_sendmsg(int sk, const struct msghdr *msg, int flags, int msglen) { int error = sendmsg(sk, msg, flags); - if (msglen != error) - tst_brkm(TBROK, tst_exit, "sendmsg: error:%d errno:%d", - error, errno); + + if (msglen != error) + tst_brkm(TBROK, tst_exit, "sendmsg: error:%d errno:%d", error, errno); + return error; } static inline int test_recv(int sk, void *buf, size_t len, int flags) { int error = recv(sk, buf, len, flags); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "recv: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "recv: %s", strerror(errno)); + return error; } static inline int test_recvmsg(int sk, struct msghdr *msg, int flags) { int error = recvmsg(sk, msg, flags); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "recvmsg: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "recvmsg: %s", strerror(errno)); + return error; } static inline int test_shutdown(int sk, int how) { int error = shutdown(sk, how); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "shutdown: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "shutdown: %s", strerror(errno)); + return error; } @@ -241,6 +266,7 @@ static inline int test_getsockopt(int sk, int optname, void *optval, socklen_t *optlen) { int error = getsockopt(sk, SOL_SCTP, optname, optval, optlen); + if (error) tst_brkm(TBROK, tst_exit, "getsockopt(%d): %s", optname, strerror(errno)); @@ -251,17 +277,21 @@ static inline int test_setsockopt(int sk, int optname, const void *optval, socklen_t optlen) { int error = setsockopt(sk, SOL_SCTP, optname, optval, optlen); + if (error) tst_brkm(TBROK, tst_exit, "setsockopt(%d): %s", optname, strerror(errno)); + return error; } static inline int test_sctp_peeloff(int sk, sctp_assoc_t assoc_id) { int error = sctp_peeloff(sk, assoc_id); - if (-1 == error) - tst_brkm(TBROK, tst_exit, "sctp_peeloff: %s", strerror(errno)); + + if (error == -1) + tst_brkm(TBROK, tst_exit, "sctp_peeloff: %s", strerror(errno)); + return error; } @@ -272,10 +302,12 @@ static inline int test_sctp_sendmsg(int s, const void *msg, size_t len, uint32_t context) { int error = sctp_sendmsg(s, msg, len, to, tolen, ppid, flags, stream_no, - timetolive, context); - if ((long)len != error) + timetolive, context); + + if (error != (long)len) tst_brkm(TBROK, tst_exit, "sctp_sendmsg: error:%d errno:%d", error, errno); + return error; } @@ -284,9 +316,11 @@ static inline int test_sctp_send(int s, const void *msg, size_t len, int flags) { int error = sctp_send(s, msg, len, sinfo, flags); - if ((long)len != error) + + if (error != (long)len) tst_brkm(TBROK, tst_exit, "sctp_send: error:%d errno:%d", error, errno); + return error; } @@ -296,16 +330,20 @@ static inline int test_sctp_recvmsg(int sk, void *msg, size_t len, int *msg_flags) { int error = sctp_recvmsg(sk, msg, len, from, fromlen, sinfo, msg_flags); - if (-1 == error) + + if (error == -1) tst_brkm(TBROK, tst_exit, "sctp_recvmsg: %s", strerror(errno)); + return error; } static inline void *test_malloc(size_t size) { void *buf = malloc(size); - if (NULL == buf) - tst_brkm(TBROK, tst_exit, "malloc failed"); + + if (NULL == buf) + tst_brkm(TBROK, tst_exit, "malloc failed"); + return buf; } -- 2.35.1