From f04cfd27e2d67b0fc89b079410fc11b55b6d1979 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Tue, 29 Aug 2017 14:17:11 -0700 Subject: Add improved getopt functions, pass integers by value. --- src/protocol/reqrep/rep.c | 4 ++-- src/protocol/reqrep/req.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/protocol/reqrep') diff --git a/src/protocol/reqrep/rep.c b/src/protocol/reqrep/rep.c index 14a3e46b..c26be0b0 100644 --- a/src/protocol/reqrep/rep.c +++ b/src/protocol/reqrep/rep.c @@ -362,9 +362,9 @@ rep_sock_getopt(void *arg, int opt, void *buf, size_t *szp) int rv = NNG_ENOTSUP; if (opt == nng_optid_maxttl) { - rv = nni_getopt_int(&s->ttl, buf, szp); + rv = nni_getopt_int(s->ttl, buf, szp); } else if (opt == nng_optid_raw) { - rv = nni_getopt_int(&s->raw, buf, szp); + rv = nni_getopt_int(s->raw, buf, szp); } return (rv); } diff --git a/src/protocol/reqrep/req.c b/src/protocol/reqrep/req.c index 5da5003f..1b68c6dd 100644 --- a/src/protocol/reqrep/req.c +++ b/src/protocol/reqrep/req.c @@ -273,13 +273,13 @@ req_sock_getopt(void *arg, int opt, void *buf, size_t *szp) int rv = NNG_ENOTSUP; if (opt == nng_optid_req_resendtime) { - rv = nni_getopt_usec(&s->retry, buf, szp); + rv = nni_getopt_usec(s->retry, buf, szp); } else if (opt == nng_optid_raw) { - rv = nni_getopt_int(&s->raw, buf, szp); + rv = nni_getopt_int(s->raw, buf, szp); } else if (opt == nng_optid_maxttl) { - rv = nni_getopt_int(&s->ttl, buf, szp); + rv = nni_getopt_int(s->ttl, buf, szp); } return (rv); -- cgit v1.2.3-70-g09d2