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

Scilab: fix compilation error on createMatrixOfString

Browse source
This commit is contained in:
Simon Marchetto 2013-10-09 12:58:04 +02:00
commit 8a3278ade2
2 changed files with 4 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Lib/scilab/scichar.swg
View file

@ -60,21 +60,15 @@ SwigScilabStringToChar(void *_pvApiCtx, int _iVar, char *_pcValue, char *_fname)
%fragment("SwigScilabStringFromChar", "header") {
SWIGINTERN int
SwigScilabStringFromChar(void *_pvApiCtx, int _iVarOut, char _chValue) {
SciErr sciErr;
char *pchValue = (char*)malloc(sizeof(char) * 2);
pchValue[0] = _chValue;
pchValue[1] = '\0';
sciErr = createMatrixOfString(_pvApiCtx, Rhs + _iVarOut, 1, 1, &pchValue);
if (sciErr.iErr) {
printError(&sciErr, 0);
if (createSingleString(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, pchValue))
return SWIG_ERROR;
}
free(pchValue);
return Rhs + _iVarOut;
return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
}
}

13
Lib/scilab/sciruntime.swg
View file

@ -206,7 +206,6 @@ SWIG_Scilab_NewMemberObj(void *_pvApiCtx, int _iVarOut, void *_ptr, int _sz, swi
char *r = result;
SciErr sciErr;
char **pstData = NULL;
if ((2*_sz + 1 + strlen(_type->name)) > 1000) {
return SWIG_ERROR;
}
@ -214,18 +213,10 @@ SWIG_Scilab_NewMemberObj(void *_pvApiCtx, int _iVarOut, void *_ptr, int _sz, swi
r = SWIG_PackData(r, _ptr, _sz);
strcpy(r, _type->name);
pstData = (char **)malloc(sizeof(char *));
pstData[0] = strdup(r);
sciErr = createMatrixOfString(_pvApiCtx, Rhs + _iVarOut, 1, 1, (char **)pstData);
if (sciErr.iErr) {
printError(&sciErr, 0);
if (createSingleString(_pvApiCtx, SWIG_NbInputArgument(_pvApiCtx) + _iVarOut, r))
return SWIG_ERROR;
}
free(pstData[0]);
return Rhs + _iVarOut;
return SWIG_NbInputArgument(_pvApiCtx) + _iVarOut;
}
SWIGRUNTIME int