Skip to content

Commit 4c33e6f

Browse files
committed
better nesting of listen/dial code
1 parent 3860bd1 commit 4c33e6f

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/comms.c

+2-4
Original file line numberDiff line numberDiff line change
@@ -111,14 +111,13 @@ SEXP rnng_dial(SEXP socket, SEXP url, SEXP tls, SEXP autostart, SEXP error) {
111111
const int start = NANO_INTEGER(autostart);
112112
const char *ur = CHAR(STRING_ELT(url, 0));
113113
nng_dialer *dp = R_Calloc(1, nng_dialer);
114-
nng_tls_config *cfg = NULL;
115114
nng_url *up = NULL;
116115

117116
SEXP dialer, attr, newattr, xp;
118117
int xc;
119118

120119
if (tls != R_NilValue) {
121-
cfg = (nng_tls_config *) NANO_PTR(tls);
120+
nng_tls_config *cfg = (nng_tls_config *) NANO_PTR(tls);
122121
if ((xc = nng_dialer_create(dp, *sock, ur)) ||
123122
(xc = nng_url_parse(&up, ur)) ||
124123
(xc = nng_tls_config_server_name(cfg, up->u_hostname)) ||
@@ -182,14 +181,13 @@ SEXP rnng_listen(SEXP socket, SEXP url, SEXP tls, SEXP autostart, SEXP error) {
182181
const int start = NANO_INTEGER(autostart);
183182
const char *ur = CHAR(STRING_ELT(url, 0));
184183
nng_listener *lp = R_Calloc(1, nng_listener);
185-
nng_tls_config *cfg = NULL;
186184
nng_url *up = NULL;
187185

188186
SEXP listener, attr, newattr, xp;
189187
int xc;
190188

191189
if (tls != R_NilValue) {
192-
cfg = (nng_tls_config *) NANO_PTR(tls);
190+
nng_tls_config *cfg = (nng_tls_config *) NANO_PTR(tls);
193191
if ((xc = nng_listener_create(lp, *sock, ur)) ||
194192
(xc = nng_url_parse(&up, ur)) ||
195193
(xc = nng_tls_config_server_name(cfg, up->u_hostname)) ||

0 commit comments

Comments
 (0)