From: drh <>
Date: Wed, 10 May 2023 13:56:32 +0000 (+0000)
Subject: Fix harmless compiler warnings from the CBMC compiler.
X-Git-Tag: version-3.42.0~26
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0051a56dec8c1412d622b5e758e8ec273f330324;p=thirdparty%2Fsqlite.git

Fix harmless compiler warnings from the CBMC compiler.

FossilOrigin-Name: 5bc17cbccdd369486fca049be9d7457e18f162c0e2f5475809ffc8f01c5fa9d2
---

diff --git a/manifest b/manifest
index beece745b5..b972a25a4c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Rename\ssqlite3IsTableConstraint()\sto\ssqlite3IsSingleTableConstraint()\sand\nimprove\sits\sheader\scomment,\sin\san\sattempt\sto\smake\sthe\scode\seasier\sto\sreason\nabout.\s\sNo\sfunctional\schanges\s-\sshould\sgenerate\sidentical\smachine\scode.
-D 2023-05-10T11:05:59.149
+C Fix\sharmless\scompiler\swarnings\sfrom\sthe\sCBMC\scompiler.
+D 2023-05-10T13:56:32.946
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -710,7 +710,7 @@ F src/vdbe.h 637ae853b7d42ae3951034cc63ab7c8af837861f79504cdb5399552fcd89a884
 F src/vdbeInt.h a4147a4ddf613cb1bcb555ace9e9e74a9c099d65facd88155f191b1fb4d74cfb
 F src/vdbeapi.c b4982cde547054c4f7341198db3c3008a48e1eb028f757601bf5bf2fc026cbcf
 F src/vdbeaux.c 6ee48db408d4c297a363f1e31145c09793a580e7c508bb36063dd017d67117a2
-F src/vdbeblob.c 5e61ce31aca17db8fb60395407457a8c1c7fb471dde405e0cd675974611dcfcd
+F src/vdbeblob.c 2516697b3ee8154eb8915f29466fb5d4f1ae39ee8b755ea909cefaf57ec5e2ce
 F src/vdbemem.c 1cac4028c0dabbf1f3259f107440e2780e05ac9fe419e9709e6eb4e166ba714b
 F src/vdbesort.c 43756031ca7430f7aec3ef904824a7883c4ede783e51f280d99b9b65c0796e35
 F src/vdbetrace.c fe0bc29ebd4e02c8bc5c1945f1d2e6be5927ec12c06d89b03ef2a4def34bf823
@@ -2068,8 +2068,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 7e2c2b1cee760af68cf303ce9ec1babbaf607fe54e043893c046d2d37cd0ab46
-R 2a126fc6537ab2e89822c6a7f6e0e7f6
+P 5dae897431a0a9dbb354c4a8a48f935ea7438035d96f90b83dd81eae434c8277
+R 1467e785cae819526435dd09310bb846
 U drh
-Z fcf39436102b8d866db8404789c74929
+Z 2f70947bee8313ef1d318a607ced119d
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 1f17c5cde0..dc7caf6eda 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5dae897431a0a9dbb354c4a8a48f935ea7438035d96f90b83dd81eae434c8277
\ No newline at end of file
+5bc17cbccdd369486fca049be9d7457e18f162c0e2f5475809ffc8f01c5fa9d2
\ No newline at end of file
diff --git a/src/vdbeblob.c b/src/vdbeblob.c
index a18ee05b52..32987da137 100644
--- a/src/vdbeblob.c
+++ b/src/vdbeblob.c
@@ -342,7 +342,7 @@ blob_open_out:
     if( pBlob && pBlob->pStmt ) sqlite3VdbeFinalize((Vdbe *)pBlob->pStmt);
     sqlite3DbFree(db, pBlob);
   }
-  sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr);
+  sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : (char*)0), zErr);
   sqlite3DbFree(db, zErr);
   sqlite3ParseObjectReset(&sParse);
   rc = sqlite3ApiExit(db, rc);
@@ -501,7 +501,7 @@ int sqlite3_blob_reopen(sqlite3_blob *pBlob, sqlite3_int64 iRow){
     ((Vdbe*)p->pStmt)->rc = SQLITE_OK;
     rc = blobSeekToRow(p, iRow, &zErr);
     if( rc!=SQLITE_OK ){
-      sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : 0), zErr);
+      sqlite3ErrorWithMsg(db, rc, (zErr ? "%s" : (char*)0), zErr);
       sqlite3DbFree(db, zErr);
     }
     assert( rc!=SQLITE_SCHEMA );