diff options
| author | drh <> | 2024-07-31 23:46:10 +0000 |
|---|---|---|
| committer | drh <> | 2024-07-31 23:46:10 +0000 |
| commit | a3ee3860a2bef9f44561093b5e39d9160840671b (patch) | |
| tree | fab970cd979cde29df6ca4ddc1856fd2d6af870d /src/test_tclvar.c | |
| parent | c96e47c80e67d3a21c591ccb3432f3c18153f8aa (diff) | |
| parent | a1291e79d3d0c8b6aa40b455151b988a92879e17 (diff) | |
| download | sqlite-a3ee3860a2bef9f44561093b5e39d9160840671b.tar.gz sqlite-a3ee3860a2bef9f44561093b5e39d9160840671b.zip | |
Merge all the latest trunk enhancements into the exists-to-join branch.
FossilOrigin-Name: 9084a4c8726a2c7ba1c381886e29c7b86121d531282be0d63d5988d84f6f448d
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..9be877449 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> @@ -150,10 +146,10 @@ 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 ){ + if( pCur->i2>=(int)n ){ Tcl_DecrRefCount(pCur->pList2); pCur->pList2 = 0; pCur->i2 = 0; @@ -167,14 +163,14 @@ 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; Tcl_Interp *interp = ((tclvar_vtab *)(cur->pVtab))->interp; Tcl_ListObjLength(0, pCur->pList1, &n); - while( !ok && pCur->i1<n ){ + while( !ok && pCur->i1<(int)n ){ Tcl_ListObjIndex(0, pCur->pList1, pCur->i1, &pObj); ok = next2(interp, pCur, pObj); if( !ok ){ |