Remove an unused C-preprocessor macro. No functional changes to the code.

FossilOrigin-Name: f480582ccae0e9a917d4523191025bd16016ba64

diff --git a/manifest b/manifest
index 2923bfbe6ddf5792800abb4c2196d2ca226c37ff..b80dfe9ce8c1c6525e7f68b8cc9fc3aed469ba1f 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Avoid\scalling\sbtreeParseCellPtr()\sfrom\swithin\sfillInCell()\ssince\smost\sof\nwhat\sbtreeParseCellPtr()\scomputes\sis\signored\sby\sfillInCell().\s\sInstead,\shave\nfillInCell()\scompute\sthe\svalues\sit\sneeds\sinline.\s\sPerformance\simprovement.
-D 2014-09-23T22:36:25.858
+C Remove\san\sunused\sC-preprocessor\smacro.\s\sNo\sfunctional\schanges\sto\sthe\scode.
+D 2014-09-23T23:12:53.118
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -172,7 +172,7 @@ F src/auth.c d8abcde53426275dab6243b441256fcd8ccbebb2
 F src/backup.c a31809c65623cc41849b94d368917f8bb66e6a7e
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 49ca66250c7dfa844a4d4cb8272b87420d27d3a5
-F src/btree.c 11cf36074a9829bad4506e8486bfd2431168bb54
+F src/btree.c b10d4c349e62faca4ff86f168a02ca9988d1fd6f
 F src/btree.h a79aa6a71e7f1055f01052b7f821bd1c2dce95c8
 F src/btreeInt.h a5a869ec2c3e56ee9e214ee748d7942716be0340
 F src/build.c 8dbca25988045fbf2a33c9631c42706fa6449e60
@@ -1200,7 +1200,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P bf59df66b3613c38cfb13a68091b8328ebb22c78
-R 7c25e7d21782a499afecd58eb6881944
+P 4147f6671e3faa8ddffab8387a6c7d9b5b962fc8
+R ff3738f15db60d92a05b3981ec1f9ca5
 U drh
-Z 9128d4e264c0fc76a3ba82d24c937cbe
+Z 53dcb91c2d5e4a116ccba455c707085a

diff --git a/manifest.uuid b/manifest.uuid
index 9320755605c8302c6631dc17a0aa20293cb37d82..71bf446c8dda7cb0260a42146922c72387a57f32 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4147f6671e3faa8ddffab8387a6c7d9b5b962fc8
\ No newline at end of file
+f480582ccae0e9a917d4523191025bd16016ba64
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index 5d05e98d85d92259129e172450bea8b998226cd5..5a0fd4e18406d2a860b4c0920ca228a08a142581 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -968,9 +968,6 @@ static u8 *findOverflowCell(MemPage *pPage, int iCell){
 ** are two versions of this function.  btreeParseCell() takes a 
 ** cell index as the second argument and btreeParseCellPtr() 
 ** takes a pointer to the body of the cell as its second argument.
-**
-** Within this file, the parseCell() macro can be called instead of
-** btreeParseCellPtr(). Using some compilers, this will be faster.
 */
 static void btreeParseCellPtr(
   MemPage *pPage,         /* Page containing the cell */
@@ -1034,14 +1031,12 @@ static void btreeParseCellPtr(
     pInfo->nSize = pInfo->iOverflow + 4;
   }
 }
-#define parseCell(pPage, iCell, pInfo) \
-  btreeParseCellPtr((pPage), findCell((pPage), (iCell)), (pInfo))
 static void btreeParseCell(
   MemPage *pPage,         /* Page containing the cell */
   int iCell,              /* The cell index.  First cell is 0 */
   CellInfo *pInfo         /* Fill in this structure */
 ){
-  parseCell(pPage, iCell, pInfo);
+  btreeParseCellPtr(pPage, findCell(pPage, iCell), pInfo);
 }
 
 /*