diff options
| author | Garrett D'Amore <garrett@damore.org> | 2020-11-08 20:57:35 -0800 |
|---|---|---|
| committer | Garrett D'Amore <garrett@damore.org> | 2020-11-08 20:57:35 -0800 |
| commit | 6cf8b299a4658a235033f77c2645b76043ff801e (patch) | |
| tree | 8fc2e3eb5188057905aa35ce1974216cd424a66a | |
| parent | ed5ae8e3d1e8d5ec9b308e94cdf311f897edd0c6 (diff) | |
| download | nng-6cf8b299a4658a235033f77c2645b76043ff801e.tar.gz nng-6cf8b299a4658a235033f77c2645b76043ff801e.tar.bz2 nng-6cf8b299a4658a235033f77c2645b76043ff801e.zip | |
Clean up some warnings.
| -rw-r--r-- | src/platform/posix/posix_ipcconn.c | 8 | ||||
| -rw-r--r-- | src/supplemental/tls/tls_common.c | 4 | ||||
| -rw-r--r-- | tests/testutil.c | 5 |
3 files changed, 11 insertions, 6 deletions
diff --git a/src/platform/posix/posix_ipcconn.c b/src/platform/posix/posix_ipcconn.c index cbf2610e..e77d54a4 100644 --- a/src/platform/posix/posix_ipcconn.c +++ b/src/platform/posix/posix_ipcconn.c @@ -405,7 +405,7 @@ ipc_get_peer_uid(void *arg, void *buf, size_t *szp, nni_type t) ipc_conn *c = arg; int rv; uint64_t ignore; - uint64_t id; + uint64_t id = 0; if ((rv = ipc_peerid(c, &id, &ignore, &ignore, &ignore)) != 0) { return (rv); @@ -419,7 +419,7 @@ ipc_get_peer_gid(void *arg, void *buf, size_t *szp, nni_type t) ipc_conn *c = arg; int rv; uint64_t ignore; - uint64_t id; + uint64_t id = 0; if ((rv = ipc_peerid(c, &ignore, &id, &ignore, &ignore)) != 0) { return (rv); @@ -433,7 +433,7 @@ ipc_get_peer_zoneid(void *arg, void *buf, size_t *szp, nni_type t) ipc_conn *c = arg; int rv; uint64_t ignore; - uint64_t id; + uint64_t id = 0; if ((rv = ipc_peerid(c, &ignore, &ignore, &ignore, &id)) != 0) { return (rv); @@ -451,7 +451,7 @@ ipc_get_peer_pid(void *arg, void *buf, size_t *szp, nni_type t) ipc_conn *c = arg; int rv; uint64_t ignore; - uint64_t id; + uint64_t id = 0; if ((rv = ipc_peerid(c, &ignore, &ignore, &id, &ignore)) != 0) { return (rv); diff --git a/src/supplemental/tls/tls_common.c b/src/supplemental/tls/tls_common.c index 5587cfbd..243ac20e 100644 --- a/src/supplemental/tls/tls_common.c +++ b/src/supplemental/tls/tls_common.c @@ -153,7 +153,9 @@ static void tls_conn_cancel(nni_aio *aio, void *arg, int rv) { tls_conn *conn = arg; - NNI_ASSERT(conn->user_aio == aio); + + NNI_ARG_UNUSED(aio); + // Just pass this down. If the connection is already done, this // will have no effect. nni_aio_abort(&conn->conn_aio, rv); diff --git a/tests/testutil.c b/tests/testutil.c index 7068e394..ce9978ce 100644 --- a/tests/testutil.c +++ b/tests/testutil.c @@ -267,7 +267,10 @@ testutil_next_port(void) (void) UnlockFileEx(h, 0, MAXDWORD, MAXDWORD, &olp); #else fseek(f, 0, SEEK_SET); - (void) ftruncate(fileno(f), 0); + if (ftruncate(fileno(f), 0) != 0) { + (void) fclose(f); + return (0); + } (void) fprintf(f, "%u", port); (void) lockf(fileno(f), 0, F_ULOCK); |