From: drh <>
Date: Thu, 15 Dec 2022 13:45:49 +0000 (+0000)
Subject: Fix harmless compiler warnings.
X-Git-Tag: version-3.41.0~238
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=569aef04b0d7a30f4bf52155e78423502553b11b;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings.

FossilOrigin-Name: ddb260cc52efce6472b9423cbc6b788d8c38746f1842c9f1c184c08c651b3387
---

diff --git a/manifest b/manifest
index 9f78785ed7..0ff7680c99 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Update\sa\stest\scase\sin\sscanstatus2.test\sto\saccount\sfor\srecent\splanner\senhancements.
-D 2022-12-15T11:39:12.701
+C Fix\sharmless\scompiler\swarnings.
+D 2022-12-15T13:45:49.449
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -645,8 +645,8 @@ F src/printf.c e99ee9741e79ae3873458146f59644276657340385ade4e76a5f5d1c25793764
 F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c efea4e5fbecfd6d0a9071b0be0d952620991673391b6ffaaf4c277b0bb674633
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
-F src/select.c 6bfa72ad9b8ebbd6acb77750d65b4a242480750dc861057fd3129e8d098c909e
-F src/shell.c.in 8d9dc02dd03f8fc93f3e3cdb17d8d16e8ddb985dddad213985c08186900a3ebb
+F src/select.c 86ab35ea18c892b690f7fadb9b3e649ebb870cb13c0ac9a2363265f13ba69d5d
+F src/shell.c.in 47d491325ea7e01d9d4b7f6166a83fbfc6729b3d8a546d857d627a58a5d46d73
 F src/sqlite.h.in e752f82b9d71f1d42b259b1900e4b1caf0965e844d756cd5cc91cc2cf45ed925
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h c4b9fa7a7e2bcdf850cfeb4b8a91d5ec47b7a00033bc996fd2ee96cbf2741f5f
@@ -2067,8 +2067,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 9fa2b94c2e0fd43c1a9c15a79fe1325afa1699f0685dcd039024a80185cc5658
-R 3206fac65ce2964fab31f9993a4a6fc8
-U dan
-Z 4ae9ab41e1b6fba565ca9008efdfe569
+P 53e07dc6b6521bb7757d0bc2cf12a501bb929afafdb16737058496afca8e6742
+R 265cf09e20a8e7e80eda7ddd0d2db5ee
+U drh
+Z 626d584f8dfc162e968dcc5120876193
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 8d22346f9a..1a679abfbb 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53e07dc6b6521bb7757d0bc2cf12a501bb929afafdb16737058496afca8e6742
\ No newline at end of file
+ddb260cc52efce6472b9423cbc6b788d8c38746f1842c9f1c184c08c651b3387
\ No newline at end of file
diff --git a/src/select.c b/src/select.c
index 336d1503ab..192f32c52f 100644
--- a/src/select.c
+++ b/src/select.c
@@ -2331,7 +2331,7 @@ void sqlite3SubqueryColumnTypes(
   a = pSelect->pEList->a;
   for(i=0, pCol=pTab->aCol; i<pTab->nCol; i++, pCol++){
     const char *zType;
-    i64 n, m;
+    i64 n;
     pTab->tabFlags |= (pCol->colFlags & COLFLAG_NOINSERT);
     p = a[i].pExpr;
     /* pCol->szEst = ... // Column size est for SELECT tables never used */
@@ -2370,7 +2370,7 @@ void sqlite3SubqueryColumnTypes(
       }
     }
     if( zType ){
-      m = sqlite3Strlen30(zType);
+      i64 m = sqlite3Strlen30(zType);
       n = sqlite3Strlen30(pCol->zCnName);
       pCol->zCnName = sqlite3DbReallocOrFree(db, pCol->zCnName, n+m+2);
       if( pCol->zCnName ){
diff --git a/src/shell.c.in b/src/shell.c.in
index 131a82d2a5..f41f2c95d4 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -535,7 +535,7 @@ static char *dynamicContinuePrompt(void){
     return continuePrompt;
   }else{
     if( dynPrompt.zScannerAwaits ){
-      int ncp = strlen(continuePrompt), ndp = strlen(dynPrompt.zScannerAwaits);
+      size_t ncp = strlen(continuePrompt), ndp = strlen(dynPrompt.zScannerAwaits);
       if( ndp > ncp-3 ) return continuePrompt;
       strcpy(dynPrompt.dynamicPrompt, dynPrompt.zScannerAwaits);
       while( ndp<3 ) dynPrompt.dynamicPrompt[ndp++] = ' ';
@@ -10378,10 +10378,10 @@ static int do_meta_command(char *zLine, ShellState *p){
 	  if( SQLITE_ROW==sqlite3_step(pCheckStmt) ){
 	    double countIrreversible = sqlite3_column_double(pCheckStmt, 0);
 	    if( countIrreversible>0 ){
-	      int n = (int)(countIrreversible + 0.5);
+	      int sz = (int)(countIrreversible + 0.5);
 	      utf8_printf(stderr,
 		 "Digest includes %d invalidly encoded text field%s.\n",
-		 n, (n>1)? "s": "");
+		 sz, (sz>1)? "s": "");
 	    }
 	  }
 	  sqlite3_finalize(pCheckStmt);