Use own non-allocating printf in more places (#51)

* use nano_printf() in more places

* use non-allocating drop-in for RE_printf()

* more explicit intent

Author: shikokuchuo

src/core.c

@@ -260,7 +260,7 @@ SEXP rawToChar(const unsigned char *buf, const size_t sz) {
   int i, j;
   for (i = 0, j = -1; i < sz; i++) if (buf[i]) j = i; else break;
   if (sz - i > 1) {
-    REprintf("data could not be converted to a character string\n");
+    nano_REprintf("data could not be converted to a character string\n");
     out = Rf_allocVector(RAWSXP, sz);
     memcpy(NANO_DATAPTR(out), buf, sz);
     return out;
@@ -415,7 +415,7 @@ SEXP nano_unserialize(unsigned char *buf, const size_t sz, SEXP hook) {
     }
   }
 
-  REprintf("received data could not be unserialized\n");
+  nano_REprintf("received data could not be unserialized\n");
   return nano_decode(buf, sz, 8, R_NilValue);
 
   resume: ;
@@ -470,7 +470,7 @@ SEXP nano_decode(unsigned char *buf, const size_t sz, const uint8_t mod, SEXP ho
   case 3:
     size = 2 * sizeof(double);
     if (sz % size) {
-      REprintf("received data could not be converted to complex\n");
+      nano_REprintf("received data could not be converted to complex\n");
       data = Rf_allocVector(RAWSXP, sz);
     } else {
       data = Rf_allocVector(CPLXSXP, sz / size);
@@ -479,7 +479,7 @@ SEXP nano_decode(unsigned char *buf, const size_t sz, const uint8_t mod, SEXP ho
   case 4:
     size = sizeof(double);
     if (sz % size) {
-      REprintf("received data could not be converted to double\n");
+      nano_REprintf("received data could not be converted to double\n");
       data = Rf_allocVector(RAWSXP, sz);
     } else {
       data = Rf_allocVector(REALSXP, sz / size);
@@ -488,7 +488,7 @@ SEXP nano_decode(unsigned char *buf, const size_t sz, const uint8_t mod, SEXP ho
   case 5:
     size = sizeof(int);
     if (sz % size) {
-      REprintf("received data could not be converted to integer\n");
+      nano_REprintf("received data could not be converted to integer\n");
       data = Rf_allocVector(RAWSXP, sz);
     } else {
       data = Rf_allocVector(INTSXP, sz / size);
@@ -497,7 +497,7 @@ SEXP nano_decode(unsigned char *buf, const size_t sz, const uint8_t mod, SEXP ho
   case 6:
     size = sizeof(int);
     if (sz % size) {
-      REprintf("received data could not be converted to logical\n");
+      nano_REprintf("received data could not be converted to logical\n");
       data = Rf_allocVector(RAWSXP, sz);
     } else {
       data = Rf_allocVector(LGLSXP, sz / size);
@@ -506,7 +506,7 @@ SEXP nano_decode(unsigned char *buf, const size_t sz, const uint8_t mod, SEXP ho
   case 7:
     size = sizeof(double);
     if (sz % size) {
-      REprintf("received data could not be converted to numeric\n");
+      nano_REprintf("received data could not be converted to numeric\n");
       data = Rf_allocVector(RAWSXP, sz);
     } else {
       data = Rf_allocVector(REALSXP, sz / size);

src/nanonext.h

@@ -246,6 +246,8 @@ int nano_encodes(const SEXP);
 int nano_matcharg(const SEXP);
 int nano_matchargs(const SEXP);
 
+void nano_REprintf(const char *);
+
 SEXP rnng_advance_rng_state(void);
 SEXP rnng_aio_call(SEXP);
 SEXP rnng_aio_collect(SEXP);

src/thread.c

@@ -20,20 +20,18 @@
 #define NANONEXT_IO
 #include "nanonext.h"
 
-// messenger -------------------------------------------------------------------
+void nano_REprintf(const char *fmt) {
 
-// # nocov start
-// tested interactively
+  if (write(STDERR_FILENO, fmt, strlen(fmt))) {} ;
 
-static void thread_finalizer(SEXP xptr) {
+}
 
-  if (NANO_PTR(xptr) == NULL) return;
-  nng_thread *xp = (nng_thread *) NANO_PTR(xptr);
-  nng_thread_destroy(xp);
+// messenger -------------------------------------------------------------------
 
-}
+// # nocov start
+// tested interactively
 
-static void nano_printf(int err, const char *fmt, ...) {
+static void nano_printf(const int err, const char *fmt, ...) {
 
   char buf[NANONEXT_INIT_BUFSIZE];
   va_list arg_ptr;
@@ -42,8 +40,15 @@ static void nano_printf(int err, const char *fmt, ...) {
   int bytes = vsnprintf(buf, NANONEXT_INIT_BUFSIZE, fmt, arg_ptr);
   va_end(arg_ptr);
 
-  ssize_t out = write(err ? STDERR_FILENO : STDOUT_FILENO, buf, (size_t) bytes);
-  memset(&out, 0, sizeof(ssize_t));
+  if (write(err ? STDERR_FILENO : STDOUT_FILENO, buf, (size_t) bytes)) {};
+
+}
+
+static void thread_finalizer(SEXP xptr) {
+
+  if (NANO_PTR(xptr) == NULL) return;
+  nng_thread *xp = (nng_thread *) NANO_PTR(xptr);
+  nng_thread_destroy(xp);
 
 }
 

src/tls.c

@@ -165,7 +165,7 @@ SEXP rnng_write_cert(SEXP cn, SEXP valid, SEXP inter) {
   snprintf(issuer_name, clen, "CN=%s,O=Nanonext,C=JP", common);
 
   int xc, exit = 1;
-  if (interactive) REprintf("Generating key + certificate [    ]");
+  if (interactive) nano_REprintf("Generating key + certificate [    ]");
   mbedtls_x509_crt issuer_crt;
   mbedtls_pk_context loaded_issuer_key;
   mbedtls_pk_context *issuer_key = &loaded_issuer_key;
@@ -191,18 +191,18 @@ SEXP rnng_write_cert(SEXP cn, SEXP valid, SEXP inter) {
   mbedtls_mpi_init(&serial);
 #endif
 
-  if (interactive) REprintf("\rGenerating key + certificate [.   ]");
+  if (interactive) nano_REprintf("\rGenerating key + certificate [.   ]");
 
   if ((xc = mbedtls_ctr_drbg_seed(&ctr_drbg, mbedtls_entropy_func, &entropy, (const unsigned char *) pers, strlen(pers))) ||
       (xc = mbedtls_pk_setup(&key, mbedtls_pk_info_from_type((mbedtls_pk_type_t) MBEDTLS_PK_RSA))))
     goto exitlevel1;
 
-  if (interactive) REprintf("\rGenerating key + certificate [..  ]");
+  if (interactive) nano_REprintf("\rGenerating key + certificate [..  ]");
 
   if ((xc = mbedtls_rsa_gen_key(mbedtls_pk_rsa(key), mbedtls_ctr_drbg_random, &ctr_drbg, 4096, 65537)))
     goto exitlevel1;
 
-  if (interactive) REprintf("\rGenerating key + certificate [... ]");
+  if (interactive) nano_REprintf("\rGenerating key + certificate [... ]");
 
   if ((xc = mbedtls_pk_write_key_pem(&key, key_buf, 16000)))
     goto exitlevel1;
@@ -256,7 +256,7 @@ SEXP rnng_write_cert(SEXP cn, SEXP valid, SEXP inter) {
   SET_STRING_ELT(cstr, 0, Rf_mkChar((char *) &output_buf));
   SET_STRING_ELT(cstr, 1, R_BlankString);
 
-  if (interactive) REprintf("\rGenerating key + certificate [done]\n");
+  if (interactive) nano_REprintf("\rGenerating key + certificate [done]\n");
   exit = 0;
 
   exitlevel1: