RC9a; tidy-ups

Author: shikokuchuo

NEWS.md

@@ -8,8 +8,8 @@
 
 *Please review the following potentially breaking changes, and only update when ready:*
 
-* The package now ensures stability of return types:
-  + `socket()` and `stream()` will now error rather than return an 'errorValue'. The error value is included in the error message.
+* The API has been re-engineered to ensure stability of return types:
+  + `socket()`, `context()` and `stream()` will now error rather than return an 'errorValue'. The error value is included in the error message.
   + `send_aio()` and `recv_aio()` now always return an integer 'errorValue' at `$result` and `$data` respectively.
   + `recv()` and `recv_aio()` now return an integer 'errorValue' at each of `$raw` and `$data` when 'keep.raw' is set to TRUE.
   + `ncurl()` now returns an integer 'errorValue' at each of `$status`, `$headers`, `$raw` and `$data` for both sync and async. Where redirects are not followed, the address is now returned as a character string at `$data`.

src/core.c

@@ -231,13 +231,7 @@ int nano_matchargs(SEXP mode) {
   if (TYPEOF(mode) == INTSXP)
     return INTEGER(mode)[0];
 
-  const char *mod;
-  if (Rf_xlength(mode) == 8) {
-    mod = CHAR(STRING_ELT(mode, 1));
-  } else {
-    mod = CHAR(STRING_ELT(mode, 0));
-  }
-
+  const char *mod = Rf_xlength(mode) == 8 ? CHAR(STRING_ELT(mode, 1)) : CHAR(STRING_ELT(mode, 0));
   size_t slen = strlen(mod);
   const char ch[] = "character", co[] = "complex", d[] = "double",
     i[] = "integer", l[] = "logical", n[] = "numeric", r[] = "raw";