aboutsummaryrefslogtreecommitdiff
path: root/src/sp
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2025-01-14 08:29:37 -0800
committerGarrett D'Amore <garrett@damore.org>2025-01-14 21:11:12 -0800
commit575148ac9a274d61e45220fda7d8de6a420f4fe4 (patch)
tree60e6b255d2aa5fe5a29889c436aba2edb2908bd5 /src/sp
parent6dc757342f5f9dedf38de356ae1802546f976bcc (diff)
downloadnng-575148ac9a274d61e45220fda7d8de6a420f4fe4.tar.gz
nng-575148ac9a274d61e45220fda7d8de6a420f4fe4.tar.bz2
nng-575148ac9a274d61e45220fda7d8de6a420f4fe4.zip
api: pipes should use nng_err
Diffstat (limited to 'src/sp')
-rw-r--r--src/sp/transport.h2
-rw-r--r--src/sp/transport/inproc/inproc.c4
-rw-r--r--src/sp/transport/ipc/ipc.c2
-rw-r--r--src/sp/transport/socket/sockfd.c4
-rw-r--r--src/sp/transport/tcp/tcp.c2
-rw-r--r--src/sp/transport/tls/tls.c6
-rw-r--r--src/sp/transport/udp/udp.c4
-rw-r--r--src/sp/transport/ws/websocket.c4
8 files changed, 14 insertions, 14 deletions
diff --git a/src/sp/transport.h b/src/sp/transport.h
index 976068c8..1c9f930b 100644
--- a/src/sp/transport.h
+++ b/src/sp/transport.h
@@ -180,7 +180,7 @@ struct nni_sp_pipe_ops {
// p_getopt is used to obtain an option. Pipes don't implement
// option setting.
- int (*p_getopt)(void *, const char *, void *, size_t *, nni_type);
+ nng_err (*p_getopt)(void *, const char *, void *, size_t *, nni_type);
};
// Transport implementation details. Transports must implement the
diff --git a/src/sp/transport/inproc/inproc.c b/src/sp/transport/inproc/inproc.c
index e87e9c4b..672c4d33 100644
--- a/src/sp/transport/inproc/inproc.c
+++ b/src/sp/transport/inproc/inproc.c
@@ -1,5 +1,5 @@
//
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
// Copyright 2018 Devolutions <info@devolutions.net>
//
@@ -577,7 +577,7 @@ static const nni_option inproc_pipe_options[] = {
},
};
-static int
+static nng_err
inproc_pipe_getopt(
void *arg, const char *name, void *v, size_t *szp, nni_type t)
{
diff --git a/src/sp/transport/ipc/ipc.c b/src/sp/transport/ipc/ipc.c
index a7b816a6..5fea1632 100644
--- a/src/sp/transport/ipc/ipc.c
+++ b/src/sp/transport/ipc/ipc.c
@@ -947,7 +947,7 @@ ipc_ep_accept(void *arg, nni_aio *aio)
nni_mtx_unlock(&ep->mtx);
}
-static int
+static nng_err
ipc_pipe_get(void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
ipc_pipe *p = arg;
diff --git a/src/sp/transport/socket/sockfd.c b/src/sp/transport/socket/sockfd.c
index 82db1163..9eea18f6 100644
--- a/src/sp/transport/socket/sockfd.c
+++ b/src/sp/transport/socket/sockfd.c
@@ -1,5 +1,5 @@
//
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
// Copyright 2019 Devolutions <info@devolutions.net>
//
@@ -546,7 +546,7 @@ sfd_tran_pipe_peer(void *arg)
return (p->peer);
}
-static int
+static nng_err
sfd_tran_pipe_getopt(
void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
diff --git a/src/sp/transport/tcp/tcp.c b/src/sp/transport/tcp/tcp.c
index 3ce193c5..c59ec5aa 100644
--- a/src/sp/transport/tcp/tcp.c
+++ b/src/sp/transport/tcp/tcp.c
@@ -567,7 +567,7 @@ tcptran_pipe_peer(void *arg)
return (p->peer);
}
-static int
+static nng_err
tcptran_pipe_getopt(
void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
diff --git a/src/sp/transport/tls/tls.c b/src/sp/transport/tls/tls.c
index a0072ddd..ed4fad05 100644
--- a/src/sp/transport/tls/tls.c
+++ b/src/sp/transport/tls/tls.c
@@ -1,5 +1,5 @@
//
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
// Copyright 2018 Capitar IT Group BV <info@capitar.com>
// Copyright 2019 Devolutions <info@devolutions.net>
//
@@ -938,12 +938,12 @@ static const nni_option tlstran_pipe_opts[] = {
},
};
-static int
+static nng_err
tlstran_pipe_getopt(
void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
tlstran_pipe *p = arg;
- int rv;
+ nng_err rv;
if ((rv = nni_stream_get(p->tls, name, buf, szp, t)) == NNG_ENOTSUP) {
rv = nni_getopt(tlstran_pipe_opts, name, p, buf, szp, t);
diff --git a/src/sp/transport/udp/udp.c b/src/sp/transport/udp/udp.c
index 45260a1b..b068be03 100644
--- a/src/sp/transport/udp/udp.c
+++ b/src/sp/transport/udp/udp.c
@@ -1,4 +1,4 @@
-// Copyright 2024 Staysail Systems, Inc. <info@staysail.tech>
+// Copyright 2025 Staysail Systems, Inc. <info@staysail.tech>
//
// This software is supplied under the terms of the MIT License, a
// copy of which should be located in the distribution where this
@@ -1082,7 +1082,7 @@ static nni_option udp_pipe_options[] = {
},
};
-static int
+static nng_err
udp_pipe_getopt(
void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
diff --git a/src/sp/transport/ws/websocket.c b/src/sp/transport/ws/websocket.c
index e236a5d6..23256edc 100644
--- a/src/sp/transport/ws/websocket.c
+++ b/src/sp/transport/ws/websocket.c
@@ -315,12 +315,12 @@ static const nni_option ws_pipe_options[] = {
}
};
-static int
+static nng_err
wstran_pipe_getopt(
void *arg, const char *name, void *buf, size_t *szp, nni_type t)
{
ws_pipe *p = arg;
- int rv;
+ nng_err rv;
if ((rv = nni_stream_get(p->ws, name, buf, szp, t)) == NNG_ENOTSUP) {
rv = nni_getopt(ws_pipe_options, name, p, buf, szp, t);