optimise core functions

Author: shikokuchuo

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: nanonext
 Type: Package
 Title: NNG (Nanomsg Next Gen) Lightweight Messaging Library
-Version: 0.9.2.9035
+Version: 0.9.2.9036
 Description: R binding for NNG (Nanomsg Next Gen), a successor to ZeroMQ. NNG is 
     a socket library providing high-performance scalability protocols, a
     cross-platform standard for messaging and communications. Serves as a

NEWS.md

@@ -1,4 +1,4 @@
-# nanonext 0.9.2.9035 (development)
+# nanonext 0.9.2.9036 (development)
 
 #### New Features
 

src/core.c

@@ -88,19 +88,19 @@ static SEXP rawOneString(unsigned char *bytes, R_xlen_t nbytes, R_xlen_t *np) {
   char *cbuf;
   SEXP res;
 
-  for (i = *np, p = bytes + (*np); i < nbytes; p++, i++)
+  for (i = *np, p = bytes + *np; i < nbytes; p++, i++)
     if (*p == '\0') break;
 
   if (i < nbytes) {
-    p = bytes + (*np);
+    p = bytes + *np;
+    res = Rf_mkCharLenCE((char *) p, (int) (i - *np), CE_NATIVE);
     *np = i + 1;
-    res = Rf_mkChar((char *) p);
   } else {
-    cbuf = R_chk_calloc(nbytes - (*np) + 1, 1);
-    memcpy(cbuf, bytes + (*np), nbytes - (*np));
-    *np = nbytes;
-    res = Rf_mkChar(cbuf);
+    cbuf = R_chk_calloc(nbytes - *np + 1, sizeof(char));
+    memcpy(cbuf, bytes + *np, nbytes - *np);
+    res = Rf_mkCharLenCE(cbuf, (int) (nbytes - *np), CE_NATIVE);
     R_Free(cbuf);
+    *np = nbytes;
   }
 
   return res;

src/tls.c

@@ -66,13 +66,13 @@ static SEXP nano_hashToChar(unsigned char *buf, size_t sz) {
 
   SEXP out;
   char cbuf[sz + sz + 1];
-  char *cptr = &cbuf[0];
+  char *cptr = cbuf;
 
   for (size_t i = 0; i < sz; i++)
     cptr += snprintf(cptr, 3, "%.2x", buf[i]);
 
   PROTECT(out = Rf_allocVector(STRSXP, 1));
-  SET_STRING_ELT(out, 0, Rf_mkCharLenCE(cbuf, sz + sz, CE_NATIVE));
+  SET_STRING_ELT(out, 0, Rf_mkCharLenCE(cbuf, (int) (sz + sz), CE_NATIVE));
 
   UNPROTECT(1);
   return out;