diff options
| author | dan <dan@noemail.net> | 2015-04-23 19:32:19 +0000 |
|---|---|---|
| committer | dan <dan@noemail.net> | 2015-04-23 19:32:19 +0000 |
| commit | e11afed5620d285f0d4d9dcb67e36cae8b152ac2 (patch) | |
| tree | 633f5e366c1dca38bd2cb71f9e42b069665c6548 /src/tclsqlite.c | |
| parent | 55d46f01c52848d403f4ea48f391fbb389bb2013 (diff) | |
| parent | 41148f83c47b0d196f9d11aaad89d3528ecb4830 (diff) | |
| download | sqlite-e11afed5620d285f0d4d9dcb67e36cae8b152ac2.tar.gz sqlite-e11afed5620d285f0d4d9dcb67e36cae8b152ac2.zip | |
Merge latest trunk changes into this branch.
FossilOrigin-Name: 1506e99eca19f72fb59b55ec9e2534505dfa7a6e
Diffstat (limited to 'src/tclsqlite.c')
| -rw-r--r-- | src/tclsqlite.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 19f2431d1..b67428f0d 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -1191,7 +1191,7 @@ static int dbPrepareAndBind( int n; u8 *data; const char *zType = (pVar->typePtr ? pVar->typePtr->name : ""); - char c = zType[0]; + c = zType[0]; if( zVar[0]=='@' || (c=='b' && strcmp(zType,"bytearray")==0 && pVar->bytes==0) ){ /* Load a BLOB type if the Tcl variable is a bytearray and @@ -2298,7 +2298,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } Tcl_DecrRefCount(pRet); }else{ - ClientData cd[2]; + ClientData cd2[2]; DbEvalContext *p; Tcl_Obj *pArray = 0; Tcl_Obj *pScript; @@ -2312,9 +2312,9 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ p = (DbEvalContext *)Tcl_Alloc(sizeof(DbEvalContext)); dbEvalInit(p, pDb, objv[2], pArray); - cd[0] = (void *)p; - cd[1] = (void *)pScript; - rc = DbEvalNextCmd(cd, interp, TCL_OK); + cd2[0] = (void *)p; + cd2[1] = (void *)pScript; + rc = DbEvalNextCmd(cd2, interp, TCL_OK); } break; } |