Merge branch master
This commit is contained in:
@@ -94,9 +94,9 @@ SQRESULT sqstd_format(HSQUIRRELVM v,SQInteger nformatstringidx,SQInteger *outlen
|
||||
if(n < 0) return -1;
|
||||
SQInteger addlen = 0;
|
||||
SQInteger valtype = 0;
|
||||
const SQChar *ts;
|
||||
SQInteger ti;
|
||||
SQFloat tf;
|
||||
const SQChar *ts = NULL;
|
||||
SQInteger ti = 0;
|
||||
SQFloat tf = 0;
|
||||
switch(format[n]) {
|
||||
case 's':
|
||||
if(SQ_FAILED(sq_getstring(v,nparam,&ts)))
|
||||
@@ -452,7 +452,7 @@ static const SQRegFunction rexobj_funcs[]={
|
||||
_DECL_REX_FUNC(capture,-2,_SC("xsn")),
|
||||
_DECL_REX_FUNC(subexpcount,1,_SC("x")),
|
||||
_DECL_REX_FUNC(_typeof,1,_SC("x")),
|
||||
{0,0,0,0}
|
||||
{NULL,(SQFUNCTION)0,0,NULL}
|
||||
};
|
||||
#undef _DECL_REX_FUNC
|
||||
|
||||
@@ -466,7 +466,7 @@ static const SQRegFunction stringlib_funcs[]={
|
||||
_DECL_FUNC(escape,2,_SC(".s")),
|
||||
_DECL_FUNC(startswith,3,_SC(".ss")),
|
||||
_DECL_FUNC(endswith,3,_SC(".ss")),
|
||||
{0,0,0,0}
|
||||
{NULL,(SQFUNCTION)0,0,NULL}
|
||||
};
|
||||
#undef _DECL_FUNC
|
||||
|
||||
|
||||
Reference in New Issue
Block a user