fixes #301 String option handling for getopt

1 files changed, 15 insertions, 27 deletions

diff --git a/src/core/options.h b/src/core/options.h
index f5743aae..35c3232f 100644
--- a/src/core/options.h
+++ b/src/core/options.h
@@ -18,22 +18,13 @@
 // nni_setopt_buf sets the queue size for the message queue.
 extern int nni_setopt_buf(nni_msgq *, const void *, size_t);
 
-// nni_getopt_buf gets the queue size for the message queue.
-extern int nni_getopt_buf(nni_msgq *, void *, size_t *);
-
 // nni_setopt_duration sets the duration.  Durations must be legal,
 // either a positive value, 0, or -1 to indicate forever.
 extern int nni_setopt_ms(nni_duration *, const void *, size_t);
 
-// nni_getopt_duration gets the duration.
-extern int nni_getopt_ms(nni_duration, void *, size_t *);
-
 // nni_setopt_bool sets a bool, or _Bool
 extern int nni_setopt_bool(bool *, const void *, size_t);
 
-// nni_getopt_bool gets a bool (or _Bool)
-extern int nni_getopt_bool(bool, void *, size_t *);
-
 // nni_setopt_int sets an integer, which must be between the minimum and
 // maximum values (inclusive).
 extern int nni_setopt_int(int *, const void *, size_t, int, int);
@@ -41,18 +32,6 @@ extern int nni_setopt_int(int *, const void *, size_t, int, int);
 #define NNI_MAXINT ((int) 2147483647)
 #define NNI_MININT ((int) -2147483648)
 
-// nni_getopt_int gets an integer.
-extern int nni_getopt_int(int, void *, size_t *);
-
-// nni_getopt_u64 gets an unsigned 64 bit number.
-extern int nni_getopt_u64(uint64_t, void *, size_t *);
-
-// nni_getopt_str gets a C style string.
-extern int nni_getopt_str(const char *, void *, size_t *);
-
-// nni_getopt_sockaddr gets an nng_sockaddr.
-extern int nni_getopt_sockaddr(const nng_sockaddr *, void *, size_t *);
-
 // nni_setopt_size sets a size_t option.
 extern int nni_setopt_size(size_t *, const void *, size_t, size_t, size_t);
 
@@ -61,15 +40,24 @@ extern int nni_setopt_size(size_t *, const void *, size_t, size_t, size_t);
 #define NNI_MINSZ (0)
 #define NNI_MAXSZ ((size_t) 0xffffffff)
 
-// nni_getopt_size obtains a size_t option.
-extern int nni_getopt_size(size_t, void *, size_t *);
-
-// nni_getopt_ptr obtains a pointer option.
-extern int nni_getopt_ptr(void *, void *, size_t *);
-
 extern int nni_chkopt_bool(size_t);
 extern int nni_chkopt_ms(const void *, size_t);
 extern int nni_chkopt_int(const void *, size_t, int, int);
 extern int nni_chkopt_size(const void *, size_t, size_t, size_t);
 
+// nni_copyout_xxx copies out a type of the named value.  It assumes that
+// the type is aligned and the size correct, unless NNI_TYPE_OPAQUE is passed.
+extern int nni_copyout(const void *, size_t, void *, size_t *);
+extern int nni_copyout_bool(bool, void *, size_t *, int);
+extern int nni_copyout_int(int, void *, size_t *, int);
+extern int nni_copyout_ms(nng_duration, void *, size_t *, int);
+extern int nni_copyout_ptr(void *, void *, size_t *, int);
+extern int nni_copyout_size(size_t, void *, size_t *, int);
+extern int nni_copyout_sockaddr(const nng_sockaddr *, void *, size_t *, int);
+extern int nni_copyout_u64(uint64_t, void *, size_t *, int);
+
+// nni_copyout_str copies out a string.  If the type is NNI_TYPE_STRING,
+// then it passes through a pointer, created by nni_strdup().
+extern int nni_copyout_str(const char *, void *, size_t *, int);
+
 #endif // CORE_OPTIONS_H