unsigned char *bufs

Author: shikokuchuo

nanonext.Rproj

@@ -17,4 +17,5 @@ StripTrailingWhitespace: Yes
 
 BuildType: Package
 PackageUseDevtools: Yes
+PackageCleanBeforeInstall: Yes
 PackageInstallArgs: --no-multiarch --with-keep.source

src/aio.c

@@ -181,7 +181,7 @@ SEXP rnng_aio_get_msg(SEXP aio, SEXP mode, SEXP keep) {
     return mk_error(res);
 
   const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
-  void *buf = nng_msg_body(raio->data);
+  unsigned char *buf = nng_msg_body(raio->data);
   size_t sz = nng_msg_len(raio->data);
 
   return nano_decode(buf, sz, mod, kpr);
@@ -210,9 +210,10 @@ SEXP rnng_aio_stream_in(SEXP aio, SEXP mode, SEXP keep) {
 
   const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   nng_iov *iov = (nng_iov *) iaio->data;
+  unsigned char *buf = iov->iov_buf;
   size_t sz = nng_aio_count(iaio->aio);
 
-  return nano_decode(iov->iov_buf, sz, mod, kpr);
+  return nano_decode(buf, sz, mod, kpr);
 
 }
 

src/core.c

@@ -44,14 +44,14 @@ SEXP rnng_serial(SEXP mode) {
 SEXP nano_encode(SEXP object) {
 
   R_xlen_t xlen = Rf_xlength(object);
-  void *buf;
   size_t sz;
   SEXP out;
 
   if (!Rf_isVectorAtomic(object))
     error_return("'data' is not an atomic vector type");
   if (TYPEOF(object) == STRSXP) {
     const char *s;
+    unsigned char *buf;
     size_t np, outlen = 0;
     R_xlen_t i;
     for (i = 0; i < xlen; i++)
@@ -67,28 +67,24 @@ SEXP nano_encode(SEXP object) {
   } else {
     switch (TYPEOF(object)) {
     case REALSXP:
-      buf = REAL(object);
       sz = xlen * sizeof(double);
       out = Rf_allocVector(RAWSXP, sz);
-      memcpy(RAW(out), buf, sz);
+      memcpy(RAW(out), REAL(object), sz);
       break;
     case INTSXP:
-      buf = INTEGER(object);
       sz = xlen * sizeof(int);
       out = Rf_allocVector(RAWSXP, sz);
-      memcpy(RAW(out), buf, sz);
+      memcpy(RAW(out), INTEGER(object), sz);
       break;
     case LGLSXP:
-      buf = LOGICAL(object);
       sz = xlen * sizeof(int);
       out = Rf_allocVector(RAWSXP, sz);
-      memcpy(RAW(out), buf, sz);
+      memcpy(RAW(out), LOGICAL(object), sz);
       break;
     case CPLXSXP:
-      buf = COMPLEX(object);
       sz = xlen * (sizeof(double) + sizeof(double));
       out = Rf_allocVector(RAWSXP, sz);
-      memcpy(RAW(out), buf, sz);
+      memcpy(RAW(out), COMPLEX(object), sz);
       break;
     case RAWSXP:
       out = object;
@@ -199,7 +195,7 @@ SEXP rnng_matchargs(SEXP mode) {
 
 }
 
-SEXP nano_decode(void *buf, size_t sz, const int mod, const int kpr) {
+SEXP nano_decode(unsigned char *buf, size_t sz, const int mod, const int kpr) {
 
   int tryErr = 0;
   SEXP raw, data;
@@ -751,7 +747,7 @@ SEXP rnng_recv(SEXP socket, SEXP mode, SEXP block, SEXP keep) {
   mode = rnng_matcharg(mode);
   const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   int xc;
-  void *buf;
+  unsigned char *buf;
   size_t sz;
   nng_aio *aiop;
   SEXP res;
@@ -847,7 +843,7 @@ SEXP rnng_ctx_recv(SEXP context, SEXP mode, SEXP timeout, SEXP keep) {
   mode = rnng_matcharg(mode);
   const int mod = INTEGER(mode)[0], kpr = LOGICAL(keep)[0];
   int xc;
-  void *buf;
+  unsigned char *buf;
   size_t sz;
   SEXP res;
 
@@ -946,6 +942,7 @@ SEXP rnng_stream_recv(SEXP stream, SEXP mode, SEXP timeout, SEXP keep, SEXP byte
   const size_t xlen = (size_t) Rf_asInteger(bytes);
   nng_duration dur;
   int xc;
+  unsigned char *buf;
   size_t sz;
   nng_iov iov;
   nng_aio *aiop;
@@ -985,8 +982,9 @@ SEXP rnng_stream_recv(SEXP stream, SEXP mode, SEXP timeout, SEXP keep, SEXP byte
     return mk_error(xc);
   }
 
+  buf = iov.iov_buf;
   sz = nng_aio_count(aiop);
-  res = nano_decode(iov.iov_buf, sz, mod, kpr);
+  res = nano_decode(buf, sz, mod, kpr);
   nng_aio_free(aiop);
   R_Free(iov.iov_buf);
 

src/nanonext.h

@@ -34,7 +34,7 @@
 
 #ifdef NANONEXT_INTERNALS
 extern SEXP mk_error(const int);
-extern SEXP nano_decode(void *, size_t, const int, const int);
+extern SEXP nano_decode(unsigned char *, size_t, const int, const int);
 extern SEXP nano_encode(SEXP);
 extern SEXP rawOneString(unsigned char *, R_xlen_t, R_xlen_t *);
 extern void socket_finalizer(SEXP);

src/utils.c

@@ -474,7 +474,7 @@ static void thread_finalizer(SEXP xptr) {
 static void rnng_thread(void *arg) {
 
   nng_socket *sock = (nng_socket *) arg;
-  void *buf;
+  unsigned char *buf;
   size_t sz;
   time_t now;
   struct tm *tms;