diff options
| author | drh <drh@noemail.net> | 2012-04-19 20:00:31 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2012-04-19 20:00:31 +0000 |
| commit | efa50bdac11c256a1bbb69b5e9cb38e5b815a443 (patch) | |
| tree | fe946cf89572530f605f7581c35a9647c783f605 /src/tclsqlite.c | |
| parent | bd91913dc0aa550b3b7d1e170e36134572bd3d00 (diff) | |
| parent | 83cc139231e651c3aba29f3b6620e26e7bae45c3 (diff) | |
| download | sqlite-efa50bdac11c256a1bbb69b5e9cb38e5b815a443.tar.gz sqlite-efa50bdac11c256a1bbb69b5e9cb38e5b815a443.zip | |
Merge the latest trunk changes into the sessions branch.
FossilOrigin-Name: 2b7a91e61794ce9ffe210bad584454e52c79924e
Diffstat (limited to 'src/tclsqlite.c')
| -rw-r--r-- | src/tclsqlite.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tclsqlite.c b/src/tclsqlite.c index cc928ff6e..b9bfbe923 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -1207,7 +1207,7 @@ static int dbPrepareAndBind( memset(pPreStmt, 0, nByte); pPreStmt->pStmt = pStmt; - pPreStmt->nSql = (*pzOut - zSql); + pPreStmt->nSql = (int)(*pzOut - zSql); pPreStmt->zSql = sqlite3_sql(pStmt); pPreStmt->apParm = (Tcl_Obj **)&pPreStmt[1]; #ifdef SQLITE_TEST @@ -3616,7 +3616,7 @@ static int md5file_cmd(void*cd, Tcl_Interp*interp, int argc, const char **argv){ MD5Init(&ctx); for(;;){ int n; - n = fread(zBuf, 1, sizeof(zBuf), in); + n = (int)fread(zBuf, 1, sizeof(zBuf), in); if( n<=0 ) break; MD5Update(&ctx, (unsigned char*)zBuf, (unsigned)n); } @@ -3662,7 +3662,7 @@ static void md5step(sqlite3_context *context, int argc, sqlite3_value **argv){ for(i=0; i<argc; i++){ const char *zData = (char*)sqlite3_value_text(argv[i]); if( zData ){ - MD5Update(p, (unsigned char*)zData, strlen(zData)); + MD5Update(p, (unsigned char*)zData, (int)strlen(zData)); } } } |