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

Scilab: refactor SwigScilabStringToCharPtr (use String API getAllocatedString())

Browse source
This commit is contained in:
Simon Marchetto 2013-06-18 16:40:12 +02:00
commit 1efaa1ae67
1 changed files with 5 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

36
Lib/scilab/scichar.swg
View file

@ -98,49 +98,23 @@ SwigScilabStringFromChar(void *_pvApiCtx, int _iVarOut, char _chValue) {
SWIGINTERN int SWIGINTERN int
SwigScilabStringToCharPtr(void *_pvApiCtx, int _iVar, char *_pcValue, int _iLength, char *_fname) { SwigScilabStringToCharPtr(void *_pvApiCtx, int _iVar, char *_pcValue, int _iLength, char *_fname) {
SciErr sciErr; SciErr sciErr;
int iRows = 0;
int iCols = 0;
int iType = 0;
int *piAddrVar = NULL; int *piAddrVar = NULL;
char *pstStrings = NULL; int iRet;
int piLength = 0;
sciErr = getVarAddressFromPosition(pvApiCtx, _iVar, &piAddrVar); sciErr = getVarAddressFromPosition(_pvApiCtx, _iVar, &piAddrVar);
if (sciErr.iErr) { if (sciErr.iErr) {
printError(&sciErr, 0); printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;
} }
sciErr = getVarType(pvApiCtx, piAddrVar, &iType); if (_pcValue == NULL) {
if (sciErr.iErr) {
printError(&sciErr, 0);
return SWIG_ERROR;
}
if (iType != sci_strings) {
Scierror(999, _("%s: Wrong type for input argument #%d: A string expected.\n"), _fname, _iVar);
return SWIG_ERROR; return SWIG_ERROR;
} }
sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &piLength, NULL); iRet = getAllocatedSingleString(_pvApiCtx, piAddrVar, &_pcValue);
if (sciErr.iErr) { if (iRet) {
printError(&sciErr, 0);
return SWIG_ERROR; return SWIG_ERROR;
} }
if (iRows * iCols != 1) {
Scierror(999, _("%s: Wrong size for input argument #%d: A string expected.\n"), _fname, _iVar);
return SWIG_ERROR;
}
pstStrings = (char *)malloc(sizeof(char) * (piLength + 1));
sciErr = getMatrixOfString(pvApiCtx, piAddrVar, &iRows, &iCols, &piLength, (char **)&pstStrings);
if (sciErr.iErr) {
printError(&sciErr, 0);
return SWIG_ERROR;
}
strcpy(_pcValue, pstStrings);
free(pstStrings);
return SWIG_OK; return SWIG_OK;
} }