diff options
| author | drh <drh@noemail.net> | 2004-02-11 02:18:05 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2004-02-11 02:18:05 +0000 |
| commit | 9eb9e26b82e5b973f81f4429f9e1978a058391e9 (patch) | |
| tree | bd231ee2932b3b70fb119f0f50ace9e96a5bcfd5 /src/tclsqlite.c | |
| parent | d86a39c866ae671fffe3edbffce0e28e4904a72a (diff) | |
| download | sqlite-9eb9e26b82e5b973f81f4429f9e1978a058391e9.tar.gz sqlite-9eb9e26b82e5b973f81f4429f9e1978a058391e9.zip | |
Pass all (relevant) regression tests when using the codec. (CVS 1223)
FossilOrigin-Name: 5200e9edc5fdba0285a3cb1cd808cbf66d7a349e
Diffstat (limited to 'src/tclsqlite.c')
| -rw-r--r-- | src/tclsqlite.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tclsqlite.c b/src/tclsqlite.c index 6fb3c3add..39f3514ce 100644 --- a/src/tclsqlite.c +++ b/src/tclsqlite.c @@ -11,7 +11,7 @@ ************************************************************************* ** A TCL Interface to SQLite ** -** $Id: tclsqlite.c,v 1.55 2004/02/01 01:22:52 drh Exp $ +** $Id: tclsqlite.c,v 1.56 2004/02/11 02:18:07 drh Exp $ */ #ifndef NO_TCL /* Omit this whole file if TCL is unavailable */ @@ -900,7 +900,7 @@ static int DbObjCmd(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ return TCL_ERROR; } pKey = Tcl_GetByteArrayFromObj(objv[2], &nKey); -#ifdef SQLITE_HAS_CRYPTO +#ifdef SQLITE_HAS_CODEC rc = sqlite_rekey(pDb->db, pKey, nKey); if( rc ){ Tcl_AppendResult(interp, sqlite_error_string(rc), 0); @@ -1016,8 +1016,8 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ Tcl_AppendResult(interp,sqlite_version,0); return TCL_OK; } - if( strcmp(zArg,"-has-crypto")==0 ){ -#ifdef SQLITE_HAS_CRYPTO + if( strcmp(zArg,"-has-codec")==0 ){ +#ifdef SQLITE_HAS_CODEC Tcl_AppendResult(interp,"1",0); #else Tcl_AppendResult(interp,"0",0); @@ -1042,8 +1042,8 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } if( objc!=3 && objc!=4 ){ Tcl_WrongNumArgs(interp, 1, objv, -#ifdef SQLITE_HAS_CRYPTO - "HANDLE FILENAME ?-key CRYPTOKEY?" +#ifdef SQLITE_HAS_CODEC + "HANDLE FILENAME ?-key CODEC-KEY?" #else "HANDLE FILENAME ?MODE?" #endif @@ -1063,7 +1063,7 @@ static int DbMain(void *cd, Tcl_Interp *interp, int objc,Tcl_Obj *const*objv){ } memset(p, 0, sizeof(*p)); zFile = Tcl_GetStringFromObj(objv[2], 0); -#ifdef SQLITE_HAS_CRYPTO +#ifdef SQLITE_HAS_CODEC if( nKey>0 ){ p->db = sqlite_open_encrypted(zFile, pKey, nKey, &zErrMsg); }else |