move serialization format to future release

Author: shikokuchuo

src/core.c

@@ -124,7 +124,7 @@ SEXP rawToChar(unsigned char *buf, const size_t sz) {
 void nano_serialize(nano_buf *buf, SEXP object) {
 
   NANO_ALLOC(buf, NANONEXT_INIT_BUFSIZE);
-  buf->buf[buf->cur++] = 7u;
+
   struct R_outpstream_st output_stream;
 
   R_InitOutPStream(
@@ -168,34 +168,11 @@ void nano_serialize_xdr(nano_buf *buf, SEXP object) {
 
 SEXP nano_unserialize(unsigned char *buf, const size_t sz) {
 
-  nano_buf nbuf;
-  struct R_inpstream_st input_stream;
-
-  if (buf[0] != 7u) {
+  if (buf[0] != 66u && buf[0] != 88u) {
     Rf_warning("received data could not be unserialized");
     return nano_decode(buf, sz, 8);
   }
 
-  nbuf.buf = buf + 1;
-  nbuf.len = sz - 1;
-  nbuf.cur = 0;
-
-  R_InitInPStream(
-    &input_stream,
-    (R_pstream_data_t) &nbuf,
-    R_pstream_any_format,
-    nano_read_char,
-    nano_read_bytes,
-    NULL,
-    R_NilValue
-  );
-
-  return R_Unserialize(&input_stream);
-
-}
-
-SEXP nano_unserialize_xdr(unsigned char *buf, const size_t sz) {
-
   nano_buf nbuf;
   struct R_inpstream_st input_stream;
 
@@ -206,7 +183,7 @@ SEXP nano_unserialize_xdr(unsigned char *buf, const size_t sz) {
   R_InitInPStream(
     &input_stream,
     (R_pstream_data_t) &nbuf,
-    R_pstream_xdr_format,
+    R_pstream_any_format,
     nano_read_char,
     nano_read_bytes,
     NULL,

src/nanonext.h

@@ -181,7 +181,6 @@ extern int nano_matchargs(SEXP);
 extern void nano_serialize(nano_buf *, SEXP);
 extern void nano_serialize_xdr(nano_buf *, SEXP);
 extern SEXP nano_unserialize(unsigned char *, const size_t);
-extern SEXP nano_unserialize_xdr(unsigned char *, const size_t);
 extern SEXP rawToChar(unsigned char *, const size_t);
 extern void socket_finalizer(SEXP);
 

src/tls.c

@@ -353,7 +353,7 @@ SEXP rnng_base64dec(SEXP x, SEXP convert) {
     out = rawToChar(buf, olen);
     break;
   default:
-    out = nano_unserialize_xdr(buf, olen);
+    out = nano_unserialize(buf, olen);
   }
 
   R_Free(buf);