fixes #301 String option handling for getopt

2 files changed, 10 insertions, 10 deletions

diff --git a/src/protocol/survey0/respond.c b/src/protocol/survey0/respond.c
index 42db2cb0..035e51b1 100644
--- a/src/protocol/survey0/respond.c
+++ b/src/protocol/survey0/respond.c
@@ -359,10 +359,10 @@ resp0_sock_setopt_raw(void *arg, const void *buf, size_t sz)
 }
 
 static int
-resp0_sock_getopt_raw(void *arg, void *buf, size_t *szp)
+resp0_sock_getopt_raw(void *arg, void *buf, size_t *szp, int typ)
 {
 	resp0_sock *s = arg;
-	return (nni_getopt_bool(s->raw, buf, szp));
+	return (nni_copyout_bool(s->raw, buf, szp, typ));
 }
 
 static int
@@ -373,10 +373,10 @@ resp0_sock_setopt_maxttl(void *arg, const void *buf, size_t sz)
 }
 
 static int
-resp0_sock_getopt_maxttl(void *arg, void *buf, size_t *szp)
+resp0_sock_getopt_maxttl(void *arg, void *buf, size_t *szp, int typ)
 {
 	resp0_sock *s = arg;
-	return (nni_getopt_int(s->ttl, buf, szp));
+	return (nni_copyout_int(s->ttl, buf, szp, typ));
 }
 
 static void
diff --git a/src/protocol/survey0/survey.c b/src/protocol/survey0/survey.c
index 40ace91b..161a5002 100644
--- a/src/protocol/survey0/survey.c
+++ b/src/protocol/survey0/survey.c
@@ -290,10 +290,10 @@ surv0_sock_setopt_raw(void *arg, const void *buf, size_t sz)
 }
 
 static int
-surv0_sock_getopt_raw(void *arg, void *buf, size_t *szp)
+surv0_sock_getopt_raw(void *arg, void *buf, size_t *szp, int typ)
 {
 	surv0_sock *s = arg;
-	return (nni_getopt_bool(s->raw, buf, szp));
+	return (nni_copyout_bool(s->raw, buf, szp, typ));
 }
 
 static int
@@ -304,10 +304,10 @@ surv0_sock_setopt_maxttl(void *arg, const void *buf, size_t sz)
 }
 
 static int
-surv0_sock_getopt_maxttl(void *arg, void *buf, size_t *szp)
+surv0_sock_getopt_maxttl(void *arg, void *buf, size_t *szp, int typ)
 {
 	surv0_sock *s = arg;
-	return (nni_getopt_int(s->ttl, buf, szp));
+	return (nni_copyout_int(s->ttl, buf, szp, typ));
 }
 
 static int
@@ -318,10 +318,10 @@ surv0_sock_setopt_surveytime(void *arg, const void *buf, size_t sz)
 }
 
 static int
-surv0_sock_getopt_surveytime(void *arg, void *buf, size_t *szp)
+surv0_sock_getopt_surveytime(void *arg, void *buf, size_t *szp, int typ)
 {
 	surv0_sock *s = arg;
-	return (nni_getopt_ms(s->survtime, buf, szp));
+	return (nni_copyout_ms(s->survtime, buf, szp, typ));
 }
 
 static void