From 0961039dd7d7ada57c8db649ab91ac37157834d4 Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 15 May 2016 00:53:11 -0500 Subject: [PATCH] change sq_getpstring to sq_getstringandsize --- include/squirrel.h | 8 +------- squirrel/sqapi.cpp | 6 +++--- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/include/squirrel.h b/include/squirrel.h index 4034fc1..830a587 100644 --- a/include/squirrel.h +++ b/include/squirrel.h @@ -156,12 +156,6 @@ typedef struct tagSQObject SQObjectValue _unVal; }SQObject; -typedef struct tagSQPString -{ - SQInteger len; - SQChar* str; -} SQPString; - typedef struct tagSQMemberHandle{ SQBool _static; SQInteger _index; @@ -264,8 +258,8 @@ SQUIRREL_API SQRESULT sq_getbase(HSQUIRRELVM v,SQInteger idx); SQUIRREL_API SQBool sq_instanceof(HSQUIRRELVM v); SQUIRREL_API SQRESULT sq_tostring(HSQUIRRELVM v,SQInteger idx); SQUIRREL_API void sq_tobool(HSQUIRRELVM v, SQInteger idx, SQBool *b); +SQUIRREL_API SQRESULT sq_getstringandsize(HSQUIRRELVM v,SQInteger idx,const SQChar **c,SQInteger *size); SQUIRREL_API SQRESULT sq_getstring(HSQUIRRELVM v,SQInteger idx,const SQChar **c); -SQUIRREL_API SQRESULT sq_getpstring(HSQUIRRELVM v,SQInteger idx,SQPString *pstr); SQUIRREL_API SQRESULT sq_getinteger(HSQUIRRELVM v,SQInteger idx,SQInteger *i); SQUIRREL_API SQRESULT sq_getfloat(HSQUIRRELVM v,SQInteger idx,SQFloat *f); SQUIRREL_API SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b); diff --git a/squirrel/sqapi.cpp b/squirrel/sqapi.cpp index 489e95f..a304f6e 100644 --- a/squirrel/sqapi.cpp +++ b/squirrel/sqapi.cpp @@ -680,12 +680,12 @@ SQRESULT sq_getbool(HSQUIRRELVM v,SQInteger idx,SQBool *b) return SQ_ERROR; } -SQRESULT sq_getpstring(HSQUIRRELVM v,SQInteger idx,SQPString *pstr) +SQRESULT sq_getstringandsize(HSQUIRRELVM v,SQInteger idx,const SQChar **c,SQInteger *size) { SQObjectPtr *o = NULL; _GETSAFE_OBJ(v, idx, OT_STRING,o); - pstr->len = _stringlen(*o); - pstr->str = _stringval(*o); + *c = _stringval(*o); + *size = _stringlen(*o); return SQ_OK; }