From: drh Date: Wed, 20 Jun 2007 15:14:10 +0000 (+0000) Subject: Remove an unused variable from btree.c. (CVS 4102) X-Git-Tag: version-3.4.1~68 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=029f3f8924204438ffacc2b853df0ca53f725690;p=thirdparty%2Fsqlite.git Remove an unused variable from btree.c. (CVS 4102) FossilOrigin-Name: cb47a8297fd91becdc4e1c50fd84b3efedd3951f --- diff --git a/manifest b/manifest index 04d9f54b75..63f9a39198 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\scomment\stypo\sin\sanalyze.c.\s\sTicket\s#2434.\s(CVS\s4101) -D 2007-06-20T13:37:31 +C Remove\san\sunused\svariable\sfrom\sbtree.c.\s(CVS\s4102) +D 2007-06-20T15:14:10 F Makefile.in 5babd49c427a0e82e849c89a4d3c3c1e607ec014 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 @@ -63,7 +63,7 @@ F src/alter.c 1b1deeb97446ed87f2fa17a3eb6236548841a348 F src/analyze.c 8d345472e0f4e44fc88f5cf489c16dcb77904525 F src/attach.c ba628db0c2b6a362f036d017bf1196cdfe4ebb37 F src/auth.c 5ea90bc93dfea46e9fe4bf531e14c7cd98219ecb -F src/btree.c bde03df933f8295e984b831779a318cc7c38f339 +F src/btree.c ca4f2d5c67bb10b76ed9917db8b6a7dd64dbd5f1 F src/btree.h 1d527bf61ed176f980c34999d5793a0fd45dcf8c F src/btreeInt.h ac1ab1fb624ffbe571786cd2bd9559f9ae336355 F src/build.c 50992d92e131a9aa9aa6657fb1ddc13e176fd70c @@ -508,7 +508,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 -P 6eaf29f5e1e99b066825a1ccf34c82c9da6da826 -R 942bb2e27eefaab302091ea0e1fe7cf6 +P df9957b94737b76ed7b1de77bb22bb27c7ae2dcf +R dbf863d91628d68fe1b1f1f779094eae U drh -Z 5e730746ca1bac3aaacfa481a54f6b5d +Z 442eb2f8160b24ef3ebe8bd258555c56 diff --git a/manifest.uuid b/manifest.uuid index e3df6eae8e..501a225c50 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -df9957b94737b76ed7b1de77bb22bb27c7ae2dcf \ No newline at end of file +cb47a8297fd91becdc4e1c50fd84b3efedd3951f \ No newline at end of file diff --git a/src/btree.c b/src/btree.c index 1586329015..7fc051cd88 100644 --- a/src/btree.c +++ b/src/btree.c @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id: btree.c,v 1.388 2007/05/24 09:20:16 danielk1977 Exp $ +** $Id: btree.c,v 1.389 2007/06/20 15:14:10 drh Exp $ ** ** This file implements a external (disk-based) database using BTrees. ** See the header comment on "btreeInt.h" for additional information. @@ -422,9 +422,8 @@ static int ptrmapGet(BtShared *pBt, Pgno key, u8 *pEType, Pgno *pPgno){ #define findCell(pPage, iCell) \ ((pPage)->aData + get2byte(&(pPage)->aData[(pPage)->cellOffset+2*(iCell)])) u8 *sqlite3BtreeFindCell(MemPage *pPage, int iCell){ - u8 *data = pPage->aData; assert( iCell>=0 ); - assert( iCellhdrOffset+3]) ); + assert( iCellaData[pPage->hdrOffset+3]) ); return findCell(pPage, iCell); }