From: drh <> Date: Tue, 31 Oct 2023 17:40:30 +0000 (+0000) Subject: Fix harmless compiler warnings in test code. X-Git-Tag: version-3.44.0~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5ba99da869063bed1c5ae3a18acbfe546d5998e4;p=thirdparty%2Fsqlite.git Fix harmless compiler warnings in test code. FossilOrigin-Name: d1895dd8f5757a339f619f22b29c8a739398ded673bb9c93f1b8eb8a4b38f510 --- diff --git a/ext/session/test_session.c b/ext/session/test_session.c index 7931f08526..af42351ba7 100644 --- a/ext/session/test_session.c +++ b/ext/session/test_session.c @@ -392,7 +392,6 @@ static int SQLITE_TCLAPI test_session_cmd( }; size_t sz = sizeof(aOpt[0]); - int rc; int iArg; int iOpt; if( Tcl_GetIndexFromObjStruct(interp,objv[2],aOpt,sz,"option",0,&iOpt) ){ diff --git a/manifest b/manifest index 9a1d67e413..1e849b5a8a 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\swith\sSQLITE_ENABLE_FTS5\sbuilds\sof\sthe\snon-amalgamation\stestfixture.exe\sin\sMakefile.msc. -D 2023-10-31T17:39:10.235 +C Fix\sharmless\scompiler\swarnings\sin\stest\scode. +D 2023-10-31T17:40:30.223 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -556,7 +556,7 @@ F ext/session/sessionstat1.test b039e38e2ba83767b464baf39b297cc0b1cc6f3292255cb4 F ext/session/sessionwor.test 6fd9a2256442cebde5b2284936ae9e0d54bde692d0f5fd009ecef8511f4cf3fc F ext/session/sqlite3session.c 7b0f9bf6479aebd49e5f34cdaeb1479cde843cf5189bca6f32db4f36c130b414 F ext/session/sqlite3session.h 4cf19a51975746d7cff2fdd74db8b769c570958e1c3639ac150d824ac1553b3e -F ext/session/test_session.c 73e9921205633a08c1497770beecf3dcbc9b826dd4358f7f8152f706eaac5d71 +F ext/session/test_session.c 7b94ad945cd4afe6c73ee935aeb3d44b4446186e1729362af616c7695a5283d9 F ext/userauth/sqlite3userauth.h 7f3ea8c4686db8e40b0a0e7a8e0b00fac13aa7a3 F ext/userauth/user-auth.txt e6641021a9210364665fe625d067617d03f27b04 F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865f002fc80cb @@ -671,7 +671,7 @@ F src/date.c eebc54a00e888d3c56147779e9f361b77d62fd69ff2008c5373946aa1ba1d574 F src/dbpage.c 80e46e1df623ec40486da7a5086cb723b0275a6e2a7b01d9f9b5da0f04ba2782 F src/dbstat.c 3b677254d512fcafd4d0b341bf267b38b235ccfddbef24f9154e19360fa22e43 F src/delete.c cb766727c78e715f9fb7ec8a7d03658ed2a3016343ca687acfcec9083cdca500 -F src/expr.c 2ad50ae13cc6402973593eebd1f9af2c0915d5f7cc2c2f4f2f3472a9a7aeddce +F src/expr.c 433f12e1237524482b0b2681c07da3cd54ddada2a625237cecde419f3e3a2553 F src/fault.c 460f3e55994363812d9d60844b2a6de88826e007 F src/fkey.c a47610f0a5c6cb0ad79f8fcef039c01833dec0c751bb695f28dc0ec6a4c3ba00 F src/func.c 472f6dcfa39cf54f89a6aec76c79c225fb880a6c14469c15d361331662b9bf43 @@ -2139,8 +2139,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 a4c7954b9380dfd3599e521f7fd40b8b556a7d0268198b302146311d20c3b162 -R 1f98e93a0b159109a29312639e89cb20 -U dan -Z 4f0457ef6cd8b07186691a33db44ec44 +P 544091cc0f5b7395a89226629267c858ec53f18095aadb3e9307ef8ea718176e +R 06db090922d30265c1e1381238ea6702 +U drh +Z de4fb7d4bf4b116e9ab6edba7e5b4842 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 69a62557e4..037b6e2c41 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -544091cc0f5b7395a89226629267c858ec53f18095aadb3e9307ef8ea718176e \ No newline at end of file +d1895dd8f5757a339f619f22b29c8a739398ded673bb9c93f1b8eb8a4b38f510 \ No newline at end of file diff --git a/src/expr.c b/src/expr.c index e071c96908..0a975ae2e5 100644 --- a/src/expr.c +++ b/src/expr.c @@ -1638,7 +1638,8 @@ static Expr *exprDup( memcpy(sEdupBuf.zAlloc, p, nNewSize); }else{ u32 nSize = (u32)exprStructSize(p); - assert( (int)(sEdupBuf.zEnd - sEdupBuf.zAlloc) >= EXPR_FULLSIZE+nToken ); + assert( (int)(sEdupBuf.zEnd - sEdupBuf.zAlloc) >= + (int)EXPR_FULLSIZE+nToken ); memcpy(sEdupBuf.zAlloc, p, nSize); if( nSize