diff options
| author | stephan <stephan@noemail.net> | 2024-08-12 13:31:43 +0000 |
|---|---|---|
| committer | stephan <stephan@noemail.net> | 2024-08-12 13:31:43 +0000 |
| commit | 57a0af406e66af40b4f0d4235d25155f80046db2 (patch) | |
| tree | 4f50fd11858d7c92efccdeac7923c874434fccab /src/test_tclvar.c | |
| parent | d35a69a8da0a5a5c54823df540f0217c1601816b (diff) | |
| parent | 8c411f7fceffe287b5f94cf449550ee5d6c11601 (diff) | |
| download | sqlite-57a0af406e66af40b4f0d4235d25155f80046db2.tar.gz sqlite-57a0af406e66af40b4f0d4235d25155f80046db2.zip | |
Merge current trunk into this branch.
FossilOrigin-Name: 900a593ddf51eebddb70e2e9ab16abe4911f58f23e574e88ed340a919b8f16b6
Diffstat (limited to 'src/test_tclvar.c')
| -rw-r--r-- | src/test_tclvar.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/src/test_tclvar.c b/src/test_tclvar.c index 36165bc27..6299960a6 100644 --- a/src/test_tclvar.c +++ b/src/test_tclvar.c @@ -36,11 +36,7 @@ ** according to "fullname" and "value" only. */ #include "sqliteInt.h" -#if defined(INCLUDE_SQLITE_TCL_H) -# include "sqlite_tcl.h" -#else -# include "tcl.h" -#endif +#include "tclsqlite.h" #include <stdlib.h> #include <string.h> @@ -72,8 +68,8 @@ struct tclvar_cursor { Tcl_Obj *pList1; /* Result of [info vars ?pattern?] */ Tcl_Obj *pList2; /* Result of [array names [lindex $pList1 $i1]] */ - int i1; /* Current item in pList1 */ - int i2; /* Current item (if any) in pList2 */ + Tcl_Size i1; /* Current item in pList1 */ + Tcl_Size i2; /* Current item (if any) in pList2 */ }; /* Methods for the tclvar module */ @@ -150,7 +146,7 @@ static int next2(Tcl_Interp *interp, tclvar_cursor *pCur, Tcl_Obj *pObj){ Tcl_IncrRefCount(pCur->pList2); assert( pCur->i2==0 ); }else{ - int n = 0; + Tcl_Size n = 0; pCur->i2++; Tcl_ListObjLength(0, pCur->pList2, &n); if( pCur->i2>=n ){ @@ -167,7 +163,7 @@ static int next2(Tcl_Interp *interp, tclvar_cursor *pCur, Tcl_Obj *pObj){ static int tclvarNext(sqlite3_vtab_cursor *cur){ Tcl_Obj *pObj; - int n = 0; + Tcl_Size n = 0; int ok = 0; tclvar_cursor *pCur = (tclvar_cursor *)cur; |