diff options
| author | Garrett D'Amore <garrett@damore.org> | 2018-02-14 14:50:04 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2018-02-14 18:28:36 -0800 |
| commit | 45bc175ef9278c175d2fc3a0678b49b18e74c449 (patch) | |
| tree | b1838778ee898112f28b35178364068c6f48c9b4 /src/platform | |
| parent | 8f93750ed2a6aaa1749eb689ddf119280f9aac7a (diff) | |
| download | nng-45bc175ef9278c175d2fc3a0678b49b18e74c449.tar.gz nng-45bc175ef9278c175d2fc3a0678b49b18e74c449.tar.bz2 nng-45bc175ef9278c175d2fc3a0678b49b18e74c449.zip | |
fixes #234 Investigate enabling more verbose compiler warnings
We enabled verbose compiler warnings, and found a lot of issues.
Some of these were even real bugs. As a bonus, we actually save
some initialization steps in the compat layer, and avoid passing
some variables we don't need.
Diffstat (limited to 'src/platform')
| -rw-r--r-- | src/platform/posix/posix_aio.h | 4 | ||||
| -rw-r--r-- | src/platform/posix/posix_epdesc.c | 8 | ||||
| -rw-r--r-- | src/platform/posix/posix_file.c | 3 | ||||
| -rw-r--r-- | src/platform/posix/posix_impl.h | 4 | ||||
| -rw-r--r-- | src/platform/posix/posix_ipc.c | 1 | ||||
| -rw-r--r-- | src/platform/posix/posix_pollq_poll.c | 5 | ||||
| -rw-r--r-- | src/platform/posix/posix_rand.c | 5 | ||||
| -rw-r--r-- | src/platform/posix/posix_sockaddr.c | 12 | ||||
| -rw-r--r-- | src/platform/posix/posix_thread.c | 7 | ||||
| -rw-r--r-- | src/platform/posix/posix_udp.c | 7 | ||||
| -rw-r--r-- | src/platform/windows/win_ipc.c | 1 | ||||
| -rw-r--r-- | src/platform/windows/win_tcp.c | 6 | ||||
| -rw-r--r-- | src/platform/windows/win_thread.c | 1 |
13 files changed, 33 insertions, 31 deletions
diff --git a/src/platform/posix/posix_aio.h b/src/platform/posix/posix_aio.h index ebc2eb99..71656391 100644 --- a/src/platform/posix/posix_aio.h +++ b/src/platform/posix/posix_aio.h @@ -33,8 +33,8 @@ extern int nni_posix_pipedesc_peername(nni_posix_pipedesc *, nni_sockaddr *); extern int nni_posix_pipedesc_sockname(nni_posix_pipedesc *, nni_sockaddr *); extern int nni_posix_epdesc_init(nni_posix_epdesc **); -extern void nni_posix_epdesc_set_local(nni_posix_epdesc *, void *, int); -extern void nni_posix_epdesc_set_remote(nni_posix_epdesc *, void *, int); +extern void nni_posix_epdesc_set_local(nni_posix_epdesc *, void *, size_t); +extern void nni_posix_epdesc_set_remote(nni_posix_epdesc *, void *, size_t); extern void nni_posix_epdesc_fini(nni_posix_epdesc *); extern void nni_posix_epdesc_close(nni_posix_epdesc *); extern void nni_posix_epdesc_connect(nni_posix_epdesc *, nni_aio *); diff --git a/src/platform/posix/posix_epdesc.c b/src/platform/posix/posix_epdesc.c index b5e65826..75383f4f 100644 --- a/src/platform/posix/posix_epdesc.c +++ b/src/platform/posix/posix_epdesc.c @@ -434,9 +434,9 @@ nni_posix_epdesc_init(nni_posix_epdesc **edp) } void -nni_posix_epdesc_set_local(nni_posix_epdesc *ed, void *sa, int len) +nni_posix_epdesc_set_local(nni_posix_epdesc *ed, void *sa, size_t len) { - if ((len < 0) || (len > sizeof(struct sockaddr_storage))) { + if ((len < 1) || (len > sizeof(struct sockaddr_storage))) { return; } nni_mtx_lock(&ed->mtx); @@ -446,9 +446,9 @@ nni_posix_epdesc_set_local(nni_posix_epdesc *ed, void *sa, int len) } void -nni_posix_epdesc_set_remote(nni_posix_epdesc *ed, void *sa, int len) +nni_posix_epdesc_set_remote(nni_posix_epdesc *ed, void *sa, size_t len) { - if ((len < 0) || (len > sizeof(struct sockaddr_storage))) { + if ((len < 1) || (len > sizeof(struct sockaddr_storage))) { return; } nni_mtx_lock(&ed->mtx); diff --git a/src/platform/posix/posix_file.c b/src/platform/posix/posix_file.c index 23a714cd..7863fdee 100644 --- a/src/platform/posix/posix_file.c +++ b/src/platform/posix/posix_file.c @@ -96,7 +96,7 @@ nni_plat_file_get(const char *name, void **datap, size_t *lenp) FILE * f; struct stat st; int rv = 0; - int len; + size_t len; void * data; if ((f = fopen(name, "rb")) == NULL) { @@ -146,7 +146,6 @@ int nni_plat_file_type(const char *name, int *typep) { struct stat sbuf; - int rv; if (stat(name, &sbuf) != 0) { return (nni_plat_errno(errno)); diff --git a/src/platform/posix/posix_impl.h b/src/platform/posix/posix_impl.h index bf79a449..0b2a09f0 100644 --- a/src/platform/posix/posix_impl.h +++ b/src/platform/posix/posix_impl.h @@ -37,8 +37,8 @@ #ifdef NNG_PLATFORM_POSIX_SOCKADDR #include <sys/socket.h> -extern int nni_posix_sockaddr2nn(nni_sockaddr *, const void *); -extern int nni_posix_nn2sockaddr(void *, const nni_sockaddr *); +extern int nni_posix_sockaddr2nn(nni_sockaddr *, const void *); +extern size_t nni_posix_nn2sockaddr(void *, const nni_sockaddr *); #endif #ifdef NNG_PLATFORM_POSIX_DEBUG diff --git a/src/platform/posix/posix_ipc.c b/src/platform/posix/posix_ipc.c index fc312736..cd9da243 100644 --- a/src/platform/posix/posix_ipc.c +++ b/src/platform/posix/posix_ipc.c @@ -97,7 +97,6 @@ static int nni_plat_ipc_remove_stale(const char *path) { int fd; - int rv; struct sockaddr_un sun; size_t sz; diff --git a/src/platform/posix/posix_pollq_poll.c b/src/platform/posix/posix_pollq_poll.c index 80bb81ee..9081c0d9 100644 --- a/src/platform/posix/posix_pollq_poll.c +++ b/src/platform/posix/posix_pollq_poll.c @@ -1,6 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -353,6 +353,7 @@ static nni_posix_pollq nni_posix_global_pollq; nni_posix_pollq * nni_posix_pollq_get(int fd) { + NNI_ARG_UNUSED(fd); // This is the point where we could choose a pollq based on FD. return (&nni_posix_global_pollq); } diff --git a/src/platform/posix/posix_rand.c b/src/platform/posix/posix_rand.c index 3f353a74..2b704e2f 100644 --- a/src/platform/posix/posix_rand.c +++ b/src/platform/posix/posix_rand.c @@ -1,5 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -42,7 +43,7 @@ void nni_plat_seed_prng(void *buf, size_t bufsz) { struct nni_plat_prng_x x; - int i; + size_t i; memset(buf, 0, bufsz); diff --git a/src/platform/posix/posix_sockaddr.c b/src/platform/posix/posix_sockaddr.c index 25953f50..e9691d91 100644 --- a/src/platform/posix/posix_sockaddr.c +++ b/src/platform/posix/posix_sockaddr.c @@ -1,6 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -22,7 +22,7 @@ #include <sys/types.h> #include <sys/un.h> -int +size_t nni_posix_nn2sockaddr(void *sa, const nni_sockaddr *na) { struct sockaddr_in * sin; @@ -34,7 +34,7 @@ nni_posix_nn2sockaddr(void *sa, const nni_sockaddr *na) size_t sz; if ((sa == NULL) || (na == NULL)) { - return (-1); + return (0); } switch (na->s_un.s_family) { case NNG_AF_INET: @@ -65,12 +65,12 @@ nni_posix_nn2sockaddr(void *sa, const nni_sockaddr *na) // Make sure that the path fits! sz = sizeof(spath->sun_path); if (nni_strlcpy(spath->sun_path, nspath->sa_path, sz) >= sz) { - return (-1); + return (0); } spath->sun_family = PF_UNIX; return (sizeof(*spath)); } - return (-1); + return (0); } int diff --git a/src/platform/posix/posix_thread.c b/src/platform/posix/posix_thread.c index d3817d91..cca8165c 100644 --- a/src/platform/posix/posix_thread.c +++ b/src/platform/posix/posix_thread.c @@ -1,6 +1,6 @@ // -// Copyright 2017 Garrett D'Amore <garrett@damore.org> -// Copyright 2017 Capitar IT Group BV <info@capitar.com> +// Copyright 2018 Staysail Systems, Inc. <info@staysail.tech> +// Copyright 2018 Capitar IT Group BV <info@capitar.com> // // This software is supplied under the terms of the MIT License, a // copy of which should be located in the distribution where this @@ -265,8 +265,6 @@ nni_plat_cv_until_fallback(nni_cv *cv, struct timespec *ts) void nni_plat_mtx_lock(nni_plat_mtx *mtx) { - int rv; - if (!mtx->fallback) { nni_pthread_mutex_lock(&mtx->mtx); @@ -328,7 +326,6 @@ nni_plat_cv_wake(nni_plat_cv *cv) void nni_plat_cv_wake1(nni_plat_cv *cv) { - int rv; if (cv->fallback) { nni_plat_cv_wake1_fallback(cv); } else { diff --git a/src/platform/posix/posix_udp.c b/src/platform/posix/posix_udp.c index cd7b0561..cde58e7c 100644 --- a/src/platform/posix/posix_udp.c +++ b/src/platform/posix/posix_udp.c @@ -108,7 +108,6 @@ nni_posix_udp_dosend(nni_plat_udp *udp) { nni_aio * aio; nni_list *q = &udp->udp_sendq; - int x = 0; // While we're able to send, do so. while ((aio = nni_list_first(q)) != NULL) { @@ -119,7 +118,7 @@ nni_posix_udp_dosend(nni_plat_udp *udp) int cnt = 0; len = nni_posix_nn2sockaddr(&ss, nni_aio_get_input(aio, 0)); - if (len < 0) { + if (len < 1) { rv = NNG_EADDRINVAL; } else { struct msghdr hdr; @@ -211,7 +210,7 @@ nni_plat_udp_open(nni_plat_udp **upp, nni_sockaddr *bindaddr) struct sockaddr_storage sa; int rv; - if ((salen = nni_posix_nn2sockaddr(&sa, bindaddr)) < 0) { + if ((salen = nni_posix_nn2sockaddr(&sa, bindaddr)) < 1) { return (NNG_EADDRINVAL); } @@ -261,8 +260,6 @@ nni_plat_udp_open(nni_plat_udp **upp, nni_sockaddr *bindaddr) void nni_plat_udp_close(nni_plat_udp *udp) { - nni_aio *aio; - // We're no longer interested in events. nni_posix_pollq_remove(&udp->udp_pitem); diff --git a/src/platform/windows/win_ipc.c b/src/platform/windows/win_ipc.c index afa1804e..f967a054 100644 --- a/src/platform/windows/win_ipc.c +++ b/src/platform/windows/win_ipc.c @@ -330,6 +330,7 @@ static int nni_win_ipc_acc_start(nni_win_event *evt, nni_aio *aio) { nni_plat_ipc_ep *ep = evt->ptr; + NNI_ARG_UNUSED(aio); if (!ConnectNamedPipe(ep->p, &evt->olpd)) { int rv = GetLastError(); diff --git a/src/platform/windows/win_tcp.c b/src/platform/windows/win_tcp.c index 6d58d495..20f324b3 100644 --- a/src/platform/windows/win_tcp.c +++ b/src/platform/windows/win_tcp.c @@ -265,6 +265,8 @@ nni_plat_tcp_ep_init(nni_plat_tcp_ep **epp, const nni_sockaddr *lsa, GUID guid2 = WSAID_ACCEPTEX; GUID guid3 = WSAID_GETACCEPTEXSOCKADDRS; + NNI_ARG_UNUSED(mode); + if ((ep = NNI_ALLOC_STRUCT(ep)) == NULL) { return (NNG_ENOMEM); } @@ -481,6 +483,8 @@ nni_win_tcp_acc_start(nni_win_event *evt, nni_aio *aio) SOCKET acc_s; DWORD cnt; + NNI_ARG_UNUSED(aio); + acc_s = socket(AF_INET6, SOCK_STREAM, IPPROTO_TCP); if (acc_s == INVALID_SOCKET) { evt->status = nni_win_error(GetLastError()); @@ -576,6 +580,8 @@ nni_win_tcp_con_start(nni_win_event *evt, nni_aio *aio) int rv; int family; + NNI_ARG_UNUSED(aio); + if (ep->loclen > 0) { family = ep->locaddr.ss_family; } else { diff --git a/src/platform/windows/win_thread.c b/src/platform/windows/win_thread.c index 971c7c37..a2ae72fe 100644 --- a/src/platform/windows/win_thread.c +++ b/src/platform/windows/win_thread.c @@ -100,6 +100,7 @@ nni_plat_cv_until(nni_plat_cv *cv, nni_time until) void nni_plat_cv_fini(nni_plat_cv *cv) { + NNI_ARG_UNUSED(cv); } static unsigned int __stdcall nni_plat_thr_main(void *arg) |
