translateCharUTF8

Author: shikokuchuo

src/core.c

@@ -50,11 +50,11 @@ SEXP nano_encode(SEXP object) {
     break;
   case STRSXP:
     for (i = 0; i < xlen; i++)
-      outlen += strlen(Rf_translateChar0(STRING_ELT(object, i))) + 1;
+      outlen += strlen(Rf_translateCharUTF8(STRING_ELT(object, i))) + 1;
     PROTECT(out = Rf_allocVector(RAWSXP, outlen));
     buf = RAW(out);
     for (i = 0, np = 0; i < xlen; i++) {
-      s = Rf_translateChar0(STRING_ELT(object, i));
+      s = Rf_translateCharUTF8(STRING_ELT(object, i));
       memcpy(buf + np, s, strlen(s) + 1);
       np += strlen(s) + 1;
     }

src/init.c

@@ -2,6 +2,21 @@
 
 #include "nanonext.h"
 
+SEXP nano_AioSymbol;
+SEXP nano_ContextSymbol;
+SEXP nano_DataSymbol;
+SEXP nano_DialerSymbol;
+SEXP nano_IdSymbol;
+SEXP nano_ListenerSymbol;
+SEXP nano_ProtocolSymbol;
+SEXP nano_ResultSymbol;
+SEXP nano_SocketSymbol;
+SEXP nano_StateSymbol;
+SEXP nano_StreamSymbol;
+SEXP nano_TextframesSymbol;
+SEXP nano_UnserSymbol;
+SEXP nano_UrlSymbol;
+
 static void RegisterSymbols(void) {
   nano_AioSymbol = Rf_install("aio");
   nano_ContextSymbol = Rf_install("context");

src/nanonext.h

@@ -42,20 +42,20 @@ extern void dialer_finalizer(SEXP);
 extern void listener_finalizer(SEXP);
 #endif
 
-SEXP nano_AioSymbol;
-SEXP nano_ContextSymbol;
-SEXP nano_DataSymbol;
-SEXP nano_DialerSymbol;
-SEXP nano_IdSymbol;
-SEXP nano_ListenerSymbol;
-SEXP nano_ProtocolSymbol;
-SEXP nano_ResultSymbol;
-SEXP nano_SocketSymbol;
-SEXP nano_StateSymbol;
-SEXP nano_StreamSymbol;
-SEXP nano_TextframesSymbol;
-SEXP nano_UnserSymbol;
-SEXP nano_UrlSymbol;
+extern SEXP nano_AioSymbol;
+extern SEXP nano_ContextSymbol;
+extern SEXP nano_DataSymbol;
+extern SEXP nano_DialerSymbol;
+extern SEXP nano_IdSymbol;
+extern SEXP nano_ListenerSymbol;
+extern SEXP nano_ProtocolSymbol;
+extern SEXP nano_ResultSymbol;
+extern SEXP nano_SocketSymbol;
+extern SEXP nano_StateSymbol;
+extern SEXP nano_StreamSymbol;
+extern SEXP nano_TextframesSymbol;
+extern SEXP nano_UnserSymbol;
+extern SEXP nano_UrlSymbol;
 
 extern SEXP rnng_aio_call(SEXP);
 extern SEXP rnng_aio_get_msg(SEXP, SEXP, SEXP);