diff options
| author | Edward Rudd <urkle@outoforder.cc> | 2021-12-29 10:13:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-29 07:13:09 -0800 |
| commit | 44fadb7042fbfdf75f20572c59e410f406bb82f4 (patch) | |
| tree | aa8380a652d7666f9f51732361494db79ec7114a /tests/ipc.c | |
| parent | 6cf5acb15147766eebdd6cf2731eacd8e0e31518 (diff) | |
| download | nng-44fadb7042fbfdf75f20572c59e410f406bb82f4.tar.gz nng-44fadb7042fbfdf75f20572c59e410f406bb82f4.tar.bz2 nng-44fadb7042fbfdf75f20572c59e410f406bb82f4.zip | |
don't use deprecated functions in tests (#1560)
Diffstat (limited to 'tests/ipc.c')
| -rw-r--r-- | tests/ipc.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tests/ipc.c b/tests/ipc.c index d910e0af..4f5de38b 100644 --- a/tests/ipc.c +++ b/tests/ipc.c @@ -36,47 +36,47 @@ check_props(nng_msg *msg) p = nng_msg_get_pipe(msg); So(nng_pipe_id(p) > 0); - So(nng_pipe_getopt_sockaddr(p, NNG_OPT_LOCADDR, &la) == 0); + So(nng_pipe_get_addr(p, NNG_OPT_LOCADDR, &la) == 0); So(la.s_family == NNG_AF_IPC); // untyped z = sizeof(nng_sockaddr); - So(nng_pipe_getopt(p, NNG_OPT_REMADDR, &ra, &z) == 0); + So(nng_pipe_get(p, NNG_OPT_REMADDR, &ra, &z) == 0); So(z == sizeof(ra)); So(ra.s_family == NNG_AF_IPC); - So(nng_pipe_getopt_size(p, NNG_OPT_REMADDR, &z) == NNG_EBADTYPE); + So(nng_pipe_get_size(p, NNG_OPT_REMADDR, &z) == NNG_EBADTYPE); z = 1; - So(nng_pipe_getopt(p, NNG_OPT_REMADDR, &ra, &z) == NNG_EINVAL); + So(nng_pipe_get(p, NNG_OPT_REMADDR, &ra, &z) == NNG_EINVAL); #ifdef _WIN32 - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_UID, &id) == + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_UID, &id) == NNG_ENOTSUP); - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_GID, &id) == + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_GID, &id) == NNG_ENOTSUP); - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_ZONEID, &id) == + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_ZONEID, &id) == NNG_ENOTSUP); - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_PID, &id) == 0); + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_PID, &id) == 0); So(id == GetCurrentProcessId()); #else - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_UID, &id) == 0); + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_UID, &id) == 0); So(id == (uint64_t) getuid()); - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_GID, &id) == 0); + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_GID, &id) == 0); So(id == (uint64_t) getgid()); #if defined(NNG_HAVE_SOPEERCRED) || defined(NNG_HAVE_GETPEERUCRED) || \ (defined(NNG_HAVE_LOCALPEERCRED) && defined(NNG_HAVE_LOCALPEERPID)) - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_PID, &id) == 0); + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_PID, &id) == 0); So(id == (uint64_t) getpid()); #else - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_PID, &id) == + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_PID, &id) == NNG_ENOTSUP); #endif #ifdef NNG_HAVE_GETPEERUCRED - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_ZONEID, &id) == 0); + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_ZONEID, &id) == 0); So(id == (uint64_t) getzoneid()); #else - So(nng_pipe_getopt_uint64(p, NNG_OPT_IPC_PEER_ZONEID, &id) == + So(nng_pipe_get_uint64(p, NNG_OPT_IPC_PEER_ZONEID, &id) == NNG_ENOTSUP); #endif #endif |