diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/defs.h | 1 | ||||
| -rw-r--r-- | src/core/options.c | 23 | ||||
| -rw-r--r-- | src/core/options.h | 4 | ||||
| -rw-r--r-- | src/core/stream.c | 32 |
4 files changed, 1 insertions, 59 deletions
diff --git a/src/core/defs.h b/src/core/defs.h index 979c0300..419f5ba7 100644 --- a/src/core/defs.h +++ b/src/core/defs.h @@ -189,7 +189,6 @@ typedef enum { NNI_TYPE_NONE, // DO NOT USE NNI_TYPE_BOOL, NNI_TYPE_INT32, - NNI_TYPE_UINT64, NNI_TYPE_SIZE, NNI_TYPE_DURATION, NNI_TYPE_STRING, diff --git a/src/core/options.c b/src/core/options.c index 1540a807..7e05c23e 100644 --- a/src/core/options.c +++ b/src/core/options.c @@ -106,18 +106,6 @@ nni_copyin_str(char *s, const void *v, size_t maxsz, nni_type t) } int -nni_copyin_u64(uint64_t *up, const void *v, size_t sz, nni_type t) -{ - NNI_ARG_UNUSED(sz); - - if (t != NNI_TYPE_UINT64) { - return (NNG_EBADTYPE); - } - *up = *(uint64_t *) v; - return (0); -} - -int nni_copyin_sockaddr(nng_sockaddr *ap, const void *v, nni_type t) { if (t != NNI_TYPE_SOCKADDR) { @@ -184,17 +172,6 @@ nni_copyout_sockaddr( } int -nni_copyout_u64(uint64_t u, void *dst, size_t *szp, nni_type t) -{ - NNI_ARG_UNUSED(szp); - if (t != NNI_TYPE_UINT64) { - return (NNG_EBADTYPE); - } - *(uint64_t *) dst = u; - return (0); -} - -int nni_copyout_str(const char *str, void *dst, size_t *szp, nni_type t) { char *s; diff --git a/src/core/options.h b/src/core/options.h index 89006630..8aa7fce7 100644 --- a/src/core/options.h +++ b/src/core/options.h @@ -1,5 +1,5 @@ // -// Copyright 2018 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> // @@ -33,7 +33,6 @@ extern int nni_copyin_size( size_t *, const void *, size_t, size_t, size_t, nni_type); extern int nni_copyin_str(char *, const void *, size_t, nni_type); extern int nni_copyin_ptr(void **, const void *, size_t, nni_type); -extern int nni_copyin_u64(uint64_t *, const void *, size_t, nni_type); extern int nni_copyin_sockaddr(nng_sockaddr *, const void *, nni_type); // nni_copyout_xxx copies out a type of the named value. It assumes that @@ -46,7 +45,6 @@ extern int nni_copyout_ptr(void *, void *, size_t *, nni_type); extern int nni_copyout_size(size_t, void *, size_t *, nni_type); extern int nni_copyout_sockaddr( const nng_sockaddr *, void *, size_t *, nni_type); -extern int nni_copyout_u64(uint64_t, void *, size_t *, nni_type); // nni_copyout_str copies out a string. If the type is NNI_TYPE_STRING, // then it passes through a pointer, created by nni_strdup(). diff --git a/src/core/stream.c b/src/core/stream.c index 2c7a9ff3..8686e5b2 100644 --- a/src/core/stream.c +++ b/src/core/stream.c @@ -368,12 +368,6 @@ nng_stream_get_size(nng_stream *s, const char *n, size_t *v) } int -nng_stream_get_uint64(nng_stream *s, const char *n, uint64_t *v) -{ - return (nni_stream_get(s, n, v, NULL, NNI_TYPE_UINT64)); -} - -int nng_stream_get_string(nng_stream *s, const char *n, char **v) { return (nni_stream_get(s, n, v, NULL, NNI_TYPE_STRING)); @@ -410,12 +404,6 @@ nng_stream_dialer_get_size(nng_stream_dialer *d, const char *n, size_t *v) } int -nng_stream_dialer_get_uint64(nng_stream_dialer *d, const char *n, uint64_t *v) -{ - return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_UINT64)); -} - -int nng_stream_dialer_get_string(nng_stream_dialer *d, const char *n, char **v) { return (nni_stream_dialer_get(d, n, v, NULL, NNI_TYPE_STRING)); @@ -459,13 +447,6 @@ nng_stream_listener_get_size(nng_stream_listener *l, const char *n, size_t *v) } int -nng_stream_listener_get_uint64( - nng_stream_listener *l, const char *n, uint64_t *v) -{ - return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_UINT64)); -} - -int nng_stream_listener_get_string(nng_stream_listener *l, const char *n, char **v) { return (nni_stream_listener_get(l, n, v, NULL, NNI_TYPE_STRING)); @@ -510,12 +491,6 @@ nng_stream_dialer_set_size(nng_stream_dialer *d, const char *n, size_t v) } int -nng_stream_dialer_set_uint64(nng_stream_dialer *d, const char *n, uint64_t v) -{ - return (nni_stream_dialer_set(d, n, &v, sizeof(v), NNI_TYPE_UINT64)); -} - -int nng_stream_dialer_set_ms(nng_stream_dialer *d, const char *n, nng_duration v) { return (nni_stream_dialer_set(d, n, &v, sizeof(v), NNI_TYPE_DURATION)); @@ -561,13 +536,6 @@ nng_stream_listener_set_size(nng_stream_listener *l, const char *n, size_t v) } int -nng_stream_listener_set_uint64( - nng_stream_listener *l, const char *n, uint64_t v) -{ - return (nni_stream_listener_set(l, n, &v, sizeof(v), NNI_TYPE_UINT64)); -} - -int nng_stream_listener_set_ms( nng_stream_listener *l, const char *n, nng_duration v) { |