From: dan <Dan Kennedy>
Date: Fri, 23 Sep 2022 11:40:43 +0000 (+0000)
Subject: Fix various compiler warnings in new code on this branch.
X-Git-Tag: version-3.40.0~91^2~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80b1f6fcde2a2be6219f4e238b0199daf3ad1923;p=thirdparty%2Fsqlite.git

Fix various compiler warnings in new code on this branch.

FossilOrigin-Name: ae49e9efde3012158061def6e0a8d993abbc5933514a21f84bc10f700f61b5e2
---

diff --git a/ext/recover/sqlite3recover.c b/ext/recover/sqlite3recover.c
index a370ca0c46..9993aa42ac 100644
--- a/ext/recover/sqlite3recover.c
+++ b/ext/recover/sqlite3recover.c
@@ -526,12 +526,8 @@ static void recoverPageIsUsed(
 ){
   sqlite3_recover *p = (sqlite3_recover*)sqlite3_user_data(pCtx);
   i64 pgno = sqlite3_value_int64(apArg[0]);
-  sqlite3_stmt *pStmt = 0;
-  int bRet;
-
   assert( nArg==1 );
-  bRet = recoverBitmapQuery(p->pUsed, pgno);
-  sqlite3_result_int(pCtx, bRet);
+  sqlite3_result_int(pCtx, recoverBitmapQuery(p->pUsed, pgno));
 }
 
 /*
@@ -572,7 +568,6 @@ static void recoverGetPage(
     }
 
     if( pStmt ){
-      int rc = SQLITE_OK;
       sqlite3_bind_int64(pStmt, 1, pgno);
       if( SQLITE_ROW==sqlite3_step(pStmt) ){
         sqlite3_result_value(pCtx, sqlite3_column_value(pStmt, 0));
@@ -1039,7 +1034,6 @@ static int recoverWriteSchema2(sqlite3_recover *p){
 
   if( pSelect ){
     while( sqlite3_step(pSelect)==SQLITE_ROW ){
-      i64 iRoot = sqlite3_column_int64(pSelect, 0);
       const char *zSql = (const char*)sqlite3_column_text(pSelect, 1);
       int rc = sqlite3_exec(p->dbOut, zSql, 0, 0, 0);
       if( rc==SQLITE_OK ){
@@ -1557,8 +1551,6 @@ static int recoverWriteData(sqlite3_recover *p){
 
           if( bNewCell ){
             if( nVal>=0 ){
-              int iVal = 0;
-
               if( pInsert==0 || nVal!=nInsert ){
                 recoverFinalize(p, pInsert);
                 pInsert = recoverInsertStmt(p, pTab, nVal);
diff --git a/manifest b/manifest
index 92d350697a..3e97238582 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Merge\slatest\strunk\schanges\sinto\sthis\sbranch.
-D 2022-09-23T11:30:24.654
+C Fix\svarious\scompiler\swarnings\sin\snew\scode\son\sthis\sbranch.
+D 2022-09-23T11:40:43.554
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -397,7 +397,7 @@ F ext/recover/recoverfault2.test 321036336af23e778a87f148c4cc4407f88fbdab1fd72dd
 F ext/recover/recoverold.test 46e9d99b595fac583d4c67f74d7d89c20a435c752ef6eeb3e918b599940c88e0
 F ext/recover/recoverrowid.test 1694a1a5526d825f71279f3d02ab02a1ee4c5265de18858bf54cb8ec54487ac8
 F ext/recover/recoversql.test f9872ff2114e13ffd8ee31e1de06919f62b9b48bc080191b5bd076d10becb60f
-F ext/recover/sqlite3recover.c 699d14bf128f103f823dbeef0aa4987ae0f8cd822b113fca5be5615ca57f28de
+F ext/recover/sqlite3recover.c e4a31b4f1f7a6d18a9c71774049262cd91c3f256f41ee257fbaa7bc71dbd5622
 F ext/recover/sqlite3recover.h 81108efb8c4618d3d9c6da4df785212b0e4501aa0d25edfc463405fe839a6640
 F ext/recover/test_recover.c 72a765616a3fa9dae2ed537d79b00f365d9f639d347858341b71bda7a3a45f56
 F ext/repair/README.md 92f5e8aae749a4dae14f02eea8e1bb42d4db2b6ce5e83dbcdd6b1446997e0c15
@@ -602,7 +602,7 @@ F src/random.c 546d6feb15ec69c1aafe9bb351a277cbb498fd5410e646add673acb805714960
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c bb18acf4eded647fef88d4d543c673874dbebff516fbeba90a85e6c13f2a58cd
-F src/shell.c.in 36d5792e35515f2389f175b41486b78b1ad6e571799e3c9b211f47c3629f96e5
+F src/shell.c.in e3efe4cf89be18c96993b714c3784946ef7af9be682ad8f0e97eb1926510befd
 F src/sqlite.h.in b9b7fd73239d94db20332bb6e504688001e5564b655e1318a4427a1caef4b99e
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h a988810c9b21c0dc36dc7a62735012339dc76fc7ab448fb0792721d30eacb69d
@@ -2013,8 +2013,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P abcbb6abfe08fc590123f0aa1bd72cfdecc75908f078f1348dc0e957de98bf52 38aaf26e082bd95df6b64df43e1772fe6e20c4eb71307dcd97559cac7f11f8f1
-R 6b2b96167d95e43311ba941f50355c02
+P e87fa70ab0f9b95bbcde18567f47906a222a3fd02b4f3c2903d2bb087d361b7c
+R cddb3dc3765037df525a9b042c70398c
 U dan
-Z abbafc4cd8c328672c6dcbf15b485242
+Z 42c3428e8988c9082d113fe0563e38ab
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 696d9dd5ab..2f79bbe0c8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e87fa70ab0f9b95bbcde18567f47906a222a3fd02b4f3c2903d2bb087d361b7c
\ No newline at end of file
+ae49e9efde3012158061def6e0a8d993abbc5933514a21f84bc10f700f61b5e2
\ No newline at end of file
diff --git a/src/shell.c.in b/src/shell.c.in
index 739c2d816c..ba9f0b8eb5 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -7261,7 +7261,7 @@ end_ar_command:
 */
 static int recoverSqlCb(void *pCtx, const char *zSql){
   ShellState *pState = (ShellState*)pCtx;
-  raw_printf(stdout, "%s;\n", zSql);
+  utf8_printf(pState->out, "%s;\n", zSql);
   return SQLITE_OK;
 }