Remove unused "codec" code from the command-line shell.

FossilOrigin-Name: 37abfe0c1e5da63342389c527a9f7cbe0f8392d9

diff --git a/manifest b/manifest
index a2f9baee61c12dd65ce2e85f88a7b5432eb3b6ec..4996acd7864c25b2ce6c68307294c3589494cf99 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\sdocumentation\sfor\ssqlite3_set_auxdata().\nTicket\s[406d3b2ef91c].
-D 2013-07-18T18:45:53.278
+C Remove\sunused\s"codec"\scode\sfrom\sthe\scommand-line\sshell.
+D 2013-07-18T20:28:29.811
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5e41da95d92656a5004b03d3576e8b226858a28e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -217,7 +217,7 @@ F src/random.c cd4a67b3953b88019f8cd4ccd81394a8ddfaba50
 F src/resolve.c 89f9003e8316ee3a172795459efc2a0274e1d5a8
 F src/rowset.c 64655f1a627c9c212d9ab497899e7424a34222e0
 F src/select.c 91b62654caf8dfe292fb8882715e575d34ad3874
-F src/shell.c 4c02ec99e42aeb624bb221b253273da6c910b814
+F src/shell.c 7da98ff9cbb19d7ef213a295178039bcb457804a
 F src/sqlite.h.in ba19609c0dab076a169b0cd2e7d4a479c5b3f664
 F src/sqlite3.rc fea433eb0a59f4c9393c8e6d76a6e2596b1fe0c0
 F src/sqlite3ext.h 886f5a34de171002ad46fae8c36a7d8051c190fc
@@ -1103,7 +1103,7 @@ F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/wherecosttest.c f407dc4c79786982a475261866a161cd007947ae
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P 153deac8faca3bcc95f6f37e500b659b39b3e872
-R ec74b1ee673935f130bb86648a1098ae
+P 62465ecba7431e1d71e17a61f1af7dc65fe4fe97
+R ff789e1ed27e10ae116b350d443e40e4
 U drh
-Z 00f72fcc18f51e2cc40bcf22d8fab123
+Z 147237eb091c75d2b25ac79bc55dd938

diff --git a/manifest.uuid b/manifest.uuid
index c41b54ef2b14705f6e388b5ab78b6a88cbc0b6ca..a93721bf617fc70e26524aad7ffb25747333bcb0 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-62465ecba7431e1d71e17a61f1af7dc65fe4fe97
\ No newline at end of file
+37abfe0c1e5da63342389c527a9f7cbe0f8392d9
\ No newline at end of file

diff --git a/src/shell.c b/src/shell.c
index f0815538abe78d09b183d53da5a382ab7528731f..d6b3159a499a10fb40cf4261dd20571a3971fab8 100644 (file)
--- a/src/shell.c
+++ b/src/shell.c
@@ -1797,7 +1797,6 @@ static int do_meta_command(char *zLine, struct callback_data *p){
   if( c=='b' && n>=3 && strncmp(azArg[0], "backup", n)==0 ){
     const char *zDestFile = 0;
     const char *zDb = 0;
-    const char *zKey = 0;
     sqlite3 *pDest;
     sqlite3_backup *pBackup;
     int j;
@@ -1805,9 +1804,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       const char *z = azArg[j];
       if( z[0]=='-' ){
         while( z[0]=='-' ) z++;
-        if( strcmp(z,"key")==0 && j<nArg-1 ){
-          zKey = azArg[++j];
-        }else
+        /* No options to process at this time */
         {
           fprintf(stderr, "unknown option: %s\n", azArg[j]);
           return 1;
@@ -1833,11 +1830,6 @@ static int do_meta_command(char *zLine, struct callback_data *p){
       sqlite3_close(pDest);
       return 1;
     }
-#ifdef SQLITE_HAS_CODEC
-    sqlite3_key(pDest, zKey, (int)strlen(zKey));
-#else
-    (void)zKey;
-#endif
     open_db(p);
     pBackup = sqlite3_backup_init(pDest, "main", p->db, zDb);
     if( pBackup==0 ){
@@ -2667,7 +2659,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){
         /* sqlite3_test_control(int, uint) */
         case SQLITE_TESTCTRL_PENDING_BYTE:        
           if( nArg==3 ){
-            unsigned int opt = (unsigned int)integerValue(azArg[2]);        
+            unsigned int opt = (unsigned int)integerValue(azArg[2]);
             rc = sqlite3_test_control(testctrl, opt);
             fprintf(p->out, "%d (0x%08x)\n", rc, rc);
           } else {