Fix harmless compiler warnings in the 'dbdump' tool.

FossilOrigin-Name: 2b9bb2664c56dd3280b4aad05b7f64dd23e5b992b5621a48dbfdb7c358d0f3ae

diff --git a/ext/misc/dbdump.c b/ext/misc/dbdump.c
index 90c2dd4c44be7f6c46df1d743028516aab3883d6..b4d642286e05f9005d1559e699dba9838171706d 100644 (file)
--- a/ext/misc/dbdump.c
+++ b/ext/misc/dbdump.c
@@ -293,7 +293,6 @@ static char **tableColumnList(DState *p, const char *zTab){
         ** ordinary column in the table.  Verify that azRowid[j] is a valid
         ** name for the rowid before adding it to azCol[0].  WITHOUT ROWID
         ** tables will fail this last check */
-        int rc;
         rc = sqlite3_table_column_metadata(p->db,0,zTab,azRowid[j],0,0,0,0,0);
         if( rc==SQLITE_OK ) azCol[0] = azRowid[j];
         break;
@@ -455,12 +454,12 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
   if( strcmp(zType, "table")==0 ){
     DText sSelect;
     DText sTable;
-    char **azCol;
+    char **azTCol;
     int i;
     int nCol;
 
-    azCol = tableColumnList(p, zTable);
-    if( azCol==0 ) return 0;
+    azTCol = tableColumnList(p, zTable);
+    if( azTCol==0 ) return 0;
 
     initText(&sTable);
     appendText(&sTable, "INSERT INTO ", 0);
@@ -473,12 +472,12 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
     ** In other words:  "INSERT INTO tab(rowid,a,b,c,...) VALUES(...)"
     ** instead of the usual "INSERT INTO tab VALUES(...)".
     */
-    if( azCol[0] ){
+    if( azTCol[0] ){
       appendText(&sTable, "(", 0);
-      appendText(&sTable, azCol[0], 0);
-      for(i=1; azCol[i]; i++){
+      appendText(&sTable, azTCol[0], 0);
+      for(i=1; azTCol[i]; i++){
         appendText(&sTable, ",", 0);
-        appendText(&sTable, azCol[i], quoteChar(azCol[i]));
+        appendText(&sTable, azTCol[i], quoteChar(azTCol[i]));
       }
       appendText(&sTable, ")", 0);
     }
@@ -487,19 +486,19 @@ static int dump_callback(void *pArg, int nArg, char **azArg, char **azCol){
     /* Build an appropriate SELECT statement */
     initText(&sSelect);
     appendText(&sSelect, "SELECT ", 0);
-    if( azCol[0] ){
-      appendText(&sSelect, azCol[0], 0);
+    if( azTCol[0] ){
+      appendText(&sSelect, azTCol[0], 0);
       appendText(&sSelect, ",", 0);
     }
-    for(i=1; azCol[i]; i++){
-      appendText(&sSelect, azCol[i], quoteChar(azCol[i]));
-      if( azCol[i+1] ){
+    for(i=1; azTCol[i]; i++){
+      appendText(&sSelect, azTCol[i], quoteChar(azTCol[i]));
+      if( azTCol[i+1] ){
         appendText(&sSelect, ",", 0);
       }
     }
     nCol = i;
-    if( azCol[0]==0 ) nCol--;
-    freeColumnList(azCol);
+    if( azTCol[0]==0 ) nCol--;
+    freeColumnList(azTCol);
     appendText(&sSelect, " FROM ", 0);
     appendText(&sSelect, zTable, quoteChar(zTable));
 

diff --git a/manifest b/manifest
index bc75fd54b4b4bf6059378b4f932d4bd03e4cee57..2e92b3372e3aee239f3e1dabc5b8556e0382c8b7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sharmless\scompiler\swarning.
-D 2018-03-07T21:29:15.655
+C Fix\sharmless\scompiler\swarnings\sin\sthe\s'dbdump'\stool.
+D 2018-03-07T21:39:25.185
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F Makefile.in 7016fc56c6b9bfe5daac4f34be8be38d8c0b5fab79ccbfb764d3b23bf1c6fff3
@@ -275,7 +275,7 @@ F ext/misc/closure.c 0d2a038df8fbae7f19de42e7c7d71f2e4dc88704
 F ext/misc/completion.c 52c3f01523e3e387eb321b4739a89d1fe47cbe6025aa1f2d8d3685e9e365df0f
 F ext/misc/compress.c dd4f8a6d0baccff3c694757db5b430f3bbd821d8686d1fc24df55cf9f035b189
 F ext/misc/csv.c 1a009b93650732e22334edc92459c4630b9fa703397cbb3c8ca279921a36ca11
-F ext/misc/dbdump.c 3509fa6b8932d04e932d6b6b827b6a82ca362781b8e8f3c77336f416793e215e
+F ext/misc/dbdump.c 22018e00eb50e9ebf9067c92d4e7162dc5006a3efc4e0c19bc3829825a1043b0
 F ext/misc/eval.c f971962e92ebb8b0a4e6b62949463ee454d88fa2
 F ext/misc/fileio.c 4cad3a78bfbbea9b1414b4405fd704ee57fbe2621254b011888dae7b0ba8c513
 F ext/misc/fuzzer.c 7c64b8197bb77b7d64eff7cac7848870235d4c25
@@ -1712,7 +1712,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P c58de43b8f2723d659fc9820caf667e215fdfa9aa2d7337fc82ba5b6f8db2e4c
-R b5cfebcb148b6bd12ea0f9c75b98d805
+P 706800ba377e4a1f615ee6ab44530742f23e1d1be5b658608ca2fd352b363cb2
+R e2a5b0d26438383f9f88dd639ce8d76f
 U mistachkin
-Z d81d750d5f0547895baa87956059aaca
+Z f5b3b21114d3dd71d665bb1ec24db52c

diff --git a/manifest.uuid b/manifest.uuid
index 473964b8a15a3a92acfc7e75490db2ca52bda611..c939e0bff3639a5ea2d42572be13fbc3a92ba68f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-706800ba377e4a1f615ee6ab44530742f23e1d1be5b658608ca2fd352b363cb2
\ No newline at end of file
+2b9bb2664c56dd3280b4aad05b7f64dd23e5b992b5621a48dbfdb7c358d0f3ae
\ No newline at end of file