From 0736a958673683a9bfe0bf577b696f49c7bd8302 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Wed, 27 Sep 2017 15:14:14 -0700 Subject: Remove last vestiges of integer option numbers. --- tests/pair1.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'tests/pair1.c') diff --git a/tests/pair1.c b/tests/pair1.c index c82dd5cb..3789d7c9 100644 --- a/tests/pair1.c +++ b/tests/pair1.c @@ -14,8 +14,6 @@ #include -extern const char *nng_opt_pair1_poly; - #define APPENDSTR(m, s) nng_msg_append(m, s, strlen(s)) #define CHECKSTR(m, s) \ So(nng_msg_len(m) == strlen(s)); \ @@ -110,7 +108,7 @@ TestMain("PAIRv1 protocol", { int i; nng_msg *msg; - So(nng_setopt_int(s1, nng_opt_pair1_poly, 1) == 0); + So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); So(nng_setopt_int(s1, NNG_OPT_RECVBUF, 1) == 0); So(nng_setopt_int(s1, NNG_OPT_SENDBUF, 1) == 0); @@ -165,7 +163,7 @@ TestMain("PAIRv1 protocol", { So(nng_dial(c1, addr, NULL, 0) == 0); nng_usleep(100000); - So(nng_setopt_int(s1, nng_opt_pair1_poly, 1) == + So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == NNG_ESTATE); }); @@ -335,11 +333,11 @@ TestMain("PAIRv1 protocol", { nng_pipe p1; nng_pipe p2; - So(nng_getopt_int(s1, nng_opt_pair1_poly, &v) == 0); + So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); So(v == 0); - So(nng_setopt_int(s1, nng_opt_pair1_poly, 1) == 0); - So(nng_getopt_int(s1, nng_opt_pair1_poly, &v) == 0); + So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); + So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); So(v == 1); So(nng_listen(s1, addr, NULL, 0) == 0); @@ -396,7 +394,7 @@ TestMain("PAIRv1 protocol", { Convey("Polyamorous default works", { nng_msg *msg; - So(nng_setopt_int(s1, nng_opt_pair1_poly, 1) == 0); + So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); So(nng_listen(s1, addr, NULL, 0) == 0); So(nng_dial(c1, addr, NULL, 0) == 0); @@ -429,11 +427,11 @@ TestMain("PAIRv1 protocol", { nng_pipe p1; nng_pipe p2; - So(nng_getopt_int(s1, nng_opt_pair1_poly, &v) == 0); + So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); So(v == 0); - So(nng_setopt_int(s1, nng_opt_pair1_poly, 1) == 0); - So(nng_getopt_int(s1, nng_opt_pair1_poly, &v) == 0); + So(nng_setopt_int(s1, NNG_OPT_PAIR1_POLY, 1) == 0); + So(nng_getopt_int(s1, NNG_OPT_PAIR1_POLY, &v) == 0); So(v == 1); v = 0; -- cgit v1.2.3-70-g09d2