aboutsummaryrefslogtreecommitdiff
path: root/src/tclsqlite.c
diff options
context:
space:
mode:
authordan <dan@noemail.net>2015-04-22 09:40:35 +0000
committerdan <dan@noemail.net>2015-04-22 09:40:35 +0000
commit062c267dffc17aeea9e41c8a553bc7f20a949e04 (patch)
tree8b0be371e782c9cb20665994bb92c2ec48d27924 /src/tclsqlite.c
parent5bb97c2b801248ab08b37b99926962f7db5c0e09 (diff)
parent318d38cf7e16d0f47dc982c33e80792e06a6fff6 (diff)
downloadsqlite-062c267dffc17aeea9e41c8a553bc7f20a949e04.tar.gz
sqlite-062c267dffc17aeea9e41c8a553bc7f20a949e04.zip
Update this branch with latest trunk changes.
FossilOrigin-Name: 9797482ded7de985e3b20aedec5e4d81f55065c8
Diffstat (limited to 'src/tclsqlite.c')
-rw-r--r--src/tclsqlite.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/tclsqlite.c b/src/tclsqlite.c
index 545997bdf..cf576bbef 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;
}