Further tidy ups to #134

Author: shikokuchuo

src/aio.c

@@ -364,9 +364,9 @@ static SEXP rnng_aio_collect_impl(SEXP x, SEXP (*const func)(SEXP)) {
     PROTECT(out = Rf_allocVector(VECSXP, xlen));
     for (R_xlen_t i = 0; i < xlen; i++) {
       env = func(NANO_VECTOR(x)[i]);
-      if (TYPEOF(env) != ENVSXP) goto exit;
+      if (TYPEOF(env) != ENVSXP) goto fail;
       env = Rf_findVarInFrame(env, nano_ValueSymbol);
-      if (env == R_UnboundValue) goto exit;
+      if (env == R_UnboundValue) goto fail;
       SET_VECTOR_ELT(out, i, env);
     }
     names = Rf_getAttrib(x, R_NamesSymbol);
@@ -376,7 +376,7 @@ static SEXP rnng_aio_collect_impl(SEXP x, SEXP (*const func)(SEXP)) {
     goto resume;
   }
 
-  exit:
+  fail:
   Rf_error("object is not an Aio or list of Aios");
 
   resume:

src/net.c

@@ -88,7 +88,7 @@ SEXP rnng_ip_addr(void) {
 
 #endif
 
-  Rf_setAttrib(out, R_NamesSymbol, names);
+  Rf_namesgets(out, names);
 
   cleanup:
   UNPROTECT(2);
@@ -107,11 +107,10 @@ SEXP rnng_write_stdout(SEXP x) {
   DWORD bytes;
   if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), nbuf, (DWORD) strlen(nbuf), &bytes, NULL)) {}
 #else
-  struct iovec iov[2];
-  iov[0].iov_base = (void *) buf;
-  iov[0].iov_len = strlen(buf);
-  iov[1].iov_base = "\n";
-  iov[1].iov_len = 1;
+  struct iovec iov[2] = {
+    {.iov_base = (void *) buf, .iov_len = strlen(buf)},
+    {.iov_base = "\n", .iov_len = 1}
+  };
   if (writev(STDOUT_FILENO, iov, 2)) {}
 #endif
   return R_NilValue;