mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add the SQLITE_OMIT_CODEC_FROM_TCL compile-time option.

Browse Source 
FossilOrigin-Name: 45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e
This commit is contained in:
drh 2016-03-16 01:03:10 +00:00
parent c5db1d4b4c
commit 32f57d4c37
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Rearrange\ssome\sinternal\sfields\sin\sthe\ssqlite3_stmt\sobject\sto\savoid\sa\sharmless\nTSAN\swarning. C Add\sthe\sSQLITE_OMIT_CODEC_FROM_TCL\scompile-time\soption.
D 2016-03-16T00:36:19.731 D 2016-03-16T01:03:10.251
F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f F Makefile.in f53429fb2f313c099283659d0df6f20f932c861f
F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66 F Makefile.msc df0bf9ff7f8b3f4dd9fb4cc43f92fe58f6ec5c66
@ -359,8 +359,8 @@ F src/sqliteInt.h 84c673f27b77dfbd367cb3ed1de8b6f3b73102dc
F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24 F src/sqliteLimit.h 7b28cf72cbd52f178bfc97ea266445e351f2cd24
F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba F src/status.c 70912d7be68e9e2dbc4010c93d344af61d4c59ba
F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9 F src/table.c 5226df15ab9179b9ed558d89575ea0ce37b03fc9
F src/tclsqlite.c 54dca4eaf3a9cb0a4b845ef54ffa99225c30a52e F src/tclsqlite.c 4bf3bea9b03aeac176ac114700f35f76a1de4c8a
F src/test1.c f14a6f9e2cff6cba4d83e2b0c52857f61886cead F src/test1.c 52965bd684ddcd7f22328ebd7d50fd0b6e51f0d4
F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b F src/test2.c 5586f43fcd9a1be0830793cf9d354082c261b25b
F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f F src/test3.c a8887dabbbee3059af338f20d290084a63ed1b0f
F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e F src/test4.c d168f83cc78d02e8d35567bb5630e40dcd85ac1e
@ -1456,7 +1456,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
P 15e4a272df46cbad8e71b21551dc06a126d64d46 P e0b116edd64a55c971c368685aa343cb6beed0f1
R 82478b12d64974258326bdaae56626ca R 1b0c52bbc749be5b9a732d29d3d099e5
U drh U drh
Z e403476d229295941bbcf1df1a4408f9 Z 5dddb7cbfc6ef15baab9797e73067d60

2
manifest.uuid
View File

@ -1 +1 @@
e0b116edd64a55c971c368685aa343cb6beed0f1 45f7f0c80bd91a0c7ff859c27fd9e82e551bd83e

14
src/tclsqlite.c
View File

@ -2574,7 +2574,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
** Change the encryption key on the currently open database. ** Change the encryption key on the currently open database.
*/ */
case DB_REKEY: { case DB_REKEY: {
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
int nKey; int nKey;
void *pKey; void *pKey;
#endif #endif
@ -2582,7 +2582,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
Tcl_WrongNumArgs(interp, 2, objv, "KEY"); Tcl_WrongNumArgs(interp, 2, objv, "KEY");
return TCL_ERROR; return TCL_ERROR;
} }
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
pKey = Tcl_GetByteArrayFromObj(objv[2], &nKey); pKey = Tcl_GetByteArrayFromObj(objv[2], &nKey);
rc = sqlite3_rekey(pDb->db, pKey, nKey); rc = sqlite3_rekey(pDb->db, pKey, nKey);
if( rc ){ if( rc ){
@ -2955,7 +2955,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
const char *zVfs = 0; const char *zVfs = 0;
int flags; int flags;
Tcl_DString translatedFilename; Tcl_DString translatedFilename;
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
void *pKey = 0; void *pKey = 0;
int nKey = 0; int nKey = 0;
#endif #endif
@ -2984,7 +2984,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
return TCL_OK; return TCL_OK;
} }
if( strcmp(zArg,"-has-codec")==0 ){ if( strcmp(zArg,"-has-codec")==0 ){
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
Tcl_AppendResult(interp,"1",(char*)0); Tcl_AppendResult(interp,"1",(char*)0);
#else #else
Tcl_AppendResult(interp,"0",(char*)0); Tcl_AppendResult(interp,"0",(char*)0);
@ -2995,7 +2995,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
for(i=3; i+1<objc; i+=2){ for(i=3; i+1<objc; i+=2){
zArg = Tcl_GetString(objv[i]); zArg = Tcl_GetString(objv[i]);
if( strcmp(zArg,"-key")==0 ){ if( strcmp(zArg,"-key")==0 ){
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
pKey = Tcl_GetByteArrayFromObj(objv[i+1], &nKey); pKey = Tcl_GetByteArrayFromObj(objv[i+1], &nKey);
#endif #endif
}else if( strcmp(zArg, "-vfs")==0 ){ }else if( strcmp(zArg, "-vfs")==0 ){
@ -3053,7 +3053,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
Tcl_WrongNumArgs(interp, 1, objv, Tcl_WrongNumArgs(interp, 1, objv,
"HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN?" "HANDLE FILENAME ?-vfs VFSNAME? ?-readonly BOOLEAN? ?-create BOOLEAN?"
" ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?" " ?-nomutex BOOLEAN? ?-fullmutex BOOLEAN? ?-uri BOOLEAN?"
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
" ?-key CODECKEY?" " ?-key CODECKEY?"
#endif #endif
); );
@ -3079,7 +3079,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){
}else{ }else{
zErrMsg = sqlite3_mprintf("%s", sqlite3_errstr(rc)); zErrMsg = sqlite3_mprintf("%s", sqlite3_errstr(rc));
} }
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
if( p->db ){ if( p->db ){
sqlite3_key(p->db, pKey, nKey); sqlite3_key(p->db, pKey, nKey);
} }

2
src/test1.c
View File

@ -651,7 +651,7 @@ static int test_key(
int argc, /* Number of arguments */ int argc, /* Number of arguments */
char **argv /* Text of each argument */ char **argv /* Text of each argument */
){ ){
#ifdef SQLITE_HAS_CODEC #if defined(SQLITE_HAS_CODEC) && !defined(SQLITE_OMIT_CODEC_FROM_TCL)
sqlite3 *db; sqlite3 *db;
const char *zKey; const char *zKey;
int nKey; int nKey;