Skip to content

Commit 0705be3

Browse files
committed
RC9d; style & docs
1 parent d4b53ec commit 0705be3

File tree

5 files changed

+21
-16
lines changed

5 files changed

+21
-16
lines changed

R/docs.R

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#' @description Protocols implemented by \{nanonext\}.
2222
#'
2323
#' For an authoritative guide please refer to the online documentation for
24-
#' the NNG library at <https://nng.nanomsg.org/man/>.
24+
#' the NNG library at \url{https://nng.nanomsg.org/man/}.
2525
#'
2626
#' @section Bus (mesh networks):
2727
#'
@@ -121,14 +121,15 @@
121121
#' received.
122122
#'
123123
#' @name protocols
124+
#'
124125
NULL
125126

126127
#' Transports [Documentation]
127128
#'
128129
#' @description Transports supported by \{nanonext\}.
129130
#'
130131
#' For an authoritative guide please refer to the online documentation for
131-
#' the NNG library at <https://nng.nanomsg.org/man/>.
132+
#' the NNG library at \url{https://nng.nanomsg.org/man/}.
132133
#'
133134
#'
134135
#' @section Inproc:
@@ -282,18 +283,20 @@ NULL
282283
#' }
283284
#'
284285
#' @name transports
286+
#'
285287
NULL
286288

287289
#' Opts [Documentation]
288290
#'
289-
#' @description Options that can be set on Sockets, Contexts, Dialers or Listeners.
291+
#' @description Options that can be set on Sockets, Contexts, Streams, Dialers
292+
#' or Listeners.
290293
#'
291294
#' Some options are only meaningful or supported in certain contexts; for
292295
#' example there is no single meaningful address for a socket, since sockets
293296
#' can have multiple dialers and endpoints associated with them.
294297
#'
295298
#' For an authoritative guide please refer to the online documentation for
296-
#' the NNG library at <https://nng.nanomsg.org/man/>.
299+
#' the NNG library at \url{https://nng.nanomsg.org/man/}.
297300
#'
298301
#' @section Global Options:
299302
#'
@@ -473,5 +476,6 @@ NULL
473476
#' }
474477
#'
475478
#' @name opts
479+
#'
476480
NULL
477481

man/opts.Rd

Lines changed: 3 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/protocols.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/transports.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/aio.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -748,17 +748,17 @@ SEXP rnng_ncurl_aio(SEXP http, SEXP convert, SEXP method, SEXP headers, SEXP dat
748748
REPROTECT(env = Rf_eval(env, clo), pxi);
749749
#endif
750750
Rf_defineVar(nano_AioSymbol, aio, env);
751-
SEXP funlist = nano_aioNFuncs;
752-
for (int i = 0; i < 4; i++, funlist = CDR(funlist)) {
751+
int i = 0;
752+
for (SEXP fnlist = nano_aioNFuncs; fnlist != R_NilValue; fnlist = CDR(fnlist)) {
753753
PROTECT(fun = Rf_allocSExp(CLOSXP));
754754
SET_FORMALS(fun, nano_aioFormals);
755-
SET_BODY(fun, CAR(funlist));
755+
SET_BODY(fun, CAR(fnlist));
756756
SET_CLOENV(fun, clo);
757-
switch (i) {
758-
case 0: R_MakeActiveBinding(nano_StatusSymbol, fun, env);
759-
case 1: R_MakeActiveBinding(nano_HeadersSymbol, fun, env);
760-
case 2: R_MakeActiveBinding(nano_RawSymbol, fun, env);
761-
case 3: R_MakeActiveBinding(nano_DataSymbol, fun, env);
757+
switch (++i) {
758+
case 1: R_MakeActiveBinding(nano_StatusSymbol, fun, env);
759+
case 2: R_MakeActiveBinding(nano_HeadersSymbol, fun, env);
760+
case 3: R_MakeActiveBinding(nano_RawSymbol, fun, env);
761+
case 4: R_MakeActiveBinding(nano_DataSymbol, fun, env);
762762
}
763763
UNPROTECT(1);
764764
}

0 commit comments

Comments
 (0)