jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change CHAR method since mkCharEnc doesn't do what I thought it did in 2.6

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10389 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Joseph Wang 2008-04-26 05:50:13 +00:00
commit 7b37f04c7a
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/r/rfragments.swg
View file

@ -164,13 +164,11 @@ SWIG_FromCharPtrAndSize(const char* carray, size_t size)
{ {
SEXP t, c; SEXP t, c;
if (!carray) return R_NilValue; if (!carray) return R_NilValue;
RVERSION26(return Rf_mkCharEnc(carray, size));
RVERSIONPRE26(
Rf_protect(t = Rf_allocVector(STRSXP, 1)); Rf_protect(t = Rf_allocVector(STRSXP, 1));
c = allocString(size); c = allocString(size);
strncpy(CHAR(c), carray, size); strncpy((char *)CHAR(c), carray, size);
SET_STRING_ELT(t, 0, c); SET_STRING_ELT(t, 0, c);
Rf_unprotect(1);) Rf_unprotect(1);
return t; return t;
} }
} }