From 95b1036e9a06613201f723f231689fe9639f5769 Mon Sep 17 00:00:00 2001 From: drh <> Date: Wed, 13 Apr 2022 19:00:57 +0000 Subject: [PATCH] Fix a harmless (false-positive) unused variable compiler warning on MSVC. FossilOrigin-Name: 63b04c63de680261a0d3eaf27154a1e8e77e3e166c3f2dbaea985603991c74f7 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/vdbe.c | 13 ++++++------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/manifest b/manifest index e1bb3d3538..f41fb698fc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\ssqlite3TreeViewSrcList()\sroutine\sa\sno-op\sif\scalled\swith\sa\nNULL\sSrcList\sobject. -D 2022-04-13T18:32:04.638 +C Fix\sa\sharmless\s(false-positive)\sunused\svariable\scompiler\swarning\son\sMSVC. +D 2022-04-13T19:00:57.522 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -624,7 +624,7 @@ F src/upsert.c 8789047a8f0a601ea42fa0256d1ba3190c13746b6ba940fe2d25643a7e991937 F src/utf.c ee39565f0843775cc2c81135751ddd93eceb91a673ea2c57f61c76f288b041a0 F src/util.c 602fe229f32a96ceccae4f40824129669582096f7c355f53dbac156c9fecef23 F src/vacuum.c 6c38ddc52f0619865c91dae9c441d4d48bf3040d7dc1bc5b22da1e45547ed0b3 -F src/vdbe.c 18da83475f1df9dd3c5b9f0a203d21ce07cd515328d93af9d7fde26db7dbe6fd +F src/vdbe.c 3ad67541cde0b63a096d2e6bb8257d4b6018c997999d67a5a984f4cec304e633 F src/vdbe.h 89f5edb1422c8783a0b29db836e409876f2b3e847f78e2b21b1fbcc48a93f85f F src/vdbeInt.h 5f3d0abcf30c2b7a6672ad4386f18be0fca9c9b2cefe18f85a2e3df74f2613bf F src/vdbeapi.c 354c893f1500cf524cc45c32879b9c68893a28b77e3442c24668d6afe4236217 @@ -1947,8 +1947,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 371ddc97bef8e0d88ad965f00d27e010880174312ea36c4f1165dcf08441f40a -R 4e8aae8397ba409b4ce8af13c47b6cbd +P 185d2720e7775e3060a1647353c10aada435244db53a0732ee786788a6ecae3f +R fcfe56f1e9aa9c1e774f8b3416754aa1 U drh -Z 074a8672cb0be9c5d7de4b7d70546458 +Z a0e8c96182df0ebcaf49be445aec0e16 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 02dac6271a..066704d872 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -185d2720e7775e3060a1647353c10aada435244db53a0732ee786788a6ecae3f \ No newline at end of file +63b04c63de680261a0d3eaf27154a1e8e77e3e166c3f2dbaea985603991c74f7 \ No newline at end of file diff --git a/src/vdbe.c b/src/vdbe.c index 19a8c1b36c..1cc0a422c3 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -4994,15 +4994,14 @@ case OP_Found: { /* jump, in3 */ #ifdef SQLITE_DEBUG pC->seekOp = pOp->opcode; #endif - pIn3 = &aMem[pOp->p3]; + r.aMem = &aMem[pOp->p3]; assert( pC->eCurType==CURTYPE_BTREE ); assert( pC->uc.pCursor!=0 ); assert( pC->isTable==0 ); - if( pOp->p4.i>0 ){ + r.nField = (u16)pOp->p4.i; + if( r.nField>0 ){ /* Key values in an array of registers */ - r.nField = (u16)pOp->p4.i; r.pKeyInfo = pC->pKeyInfo; - r.aMem = pIn3; r.default_rc = 0; #ifdef SQLITE_DEBUG for(ii=0; iiuc.pCursor, &r, &pC->seekResult); }else{ /* Composite key generated by OP_MakeRecord */ - assert( pIn3->flags & MEM_Blob ); + assert( r.aMem->flags & MEM_Blob ); assert( pOp->opcode!=OP_NoConflict ); - rc = ExpandBlob(pIn3); + rc = ExpandBlob(r.aMem); assert( rc==SQLITE_OK || rc==SQLITE_NOMEM ); if( rc ) goto no_mem; pIdxKey = sqlite3VdbeAllocUnpackedRecord(pC->pKeyInfo); if( pIdxKey==0 ) goto no_mem; - sqlite3VdbeRecordUnpack(pC->pKeyInfo, pIn3->n, pIn3->z, pIdxKey); + sqlite3VdbeRecordUnpack(pC->pKeyInfo, r.aMem->n, r.aMem->z, pIdxKey); pIdxKey->default_rc = 0; rc = sqlite3BtreeIndexMoveto(pC->uc.pCursor, pIdxKey, &pC->seekResult); sqlite3DbFreeNN(db, pIdxKey); -- 2.39.5