diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/platform/posix/posix_ipcconn.c | 8 | ||||
| -rw-r--r-- | src/supplemental/tls/tls_common.c | 4 |
2 files changed, 7 insertions, 5 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); |