Refactor local variable names in the freeSpace() routine of btree.c for

improved understandability.

FossilOrigin-Name: 7e63089a191f29aefde05e89bb612f3036cfa034

diff --git a/manifest b/manifest
index c03b96d1a8e34b64b6cf6005fc13cec234e2f0fd..c1cbe5415fa92f3b58e2223ca89b60045a99bfe3 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Size\sreduction\sand\sperformance\simprovements\sin\sbtree.c\sand\sthe\nallocateSpace()\sroutine.\s\sAlso\sfix\san\sassert()\sin\sfreeSpace().
-D 2014-08-20T13:35:45.034
+C Refactor\slocal\svariable\snames\sin\sthe\sfreeSpace()\sroutine\sof\sbtree.c\sfor\nimproved\sunderstandability.
+D 2014-08-20T14:37:09.167
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5eb79e334a5de69c87740edd56af6527dd219308
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -167,7 +167,7 @@ F src/auth.c 523da7fb4979469955d822ff9298352d6b31de34
 F src/backup.c a729e63cf5cd1829507cb7b8e89f99b95141bb53
 F src/bitvec.c 19a4ba637bd85f8f63fc8c9bae5ade9fb05ec1cb
 F src/btmutex.c 976f45a12e37293e32cae0281b15a21d48a8aaa7
-F src/btree.c 53eb576f72093d5138f5b7468994121c6eb6fe98
+F src/btree.c c1235eacb8d4de12850daccb1636763218da3381
 F src/btree.h 4245a349bfe09611d7ff887dbc3a80cee8b7955a
 F src/btreeInt.h cf180d86b2e9e418f638d65baa425c4c69c0e0e3
 F src/build.c 5abf794fe8a605f2005b422e98a3cedad9b9ef5b
@@ -1186,8 +1186,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 eea0661798e10018615854c871f24be0f8bb2ff9 fe51d3aa0ce7021213293a0647e31164073e78f7
-R 3c51b363f531f6f6895a1e7e29ea4492
-T +closed fe51d3aa0ce7021213293a0647e31164073e78f7
+P 121308fa869ad490a6924798d276c0ff32759acc
+R 332118792b6ef82f7eceb02b0d545622
 U drh
-Z 25da1aeccb4d6e0fa0390c2ee1a22b6e
+Z accc32db7c4714707b5e7cc22312c49c

diff --git a/manifest.uuid b/manifest.uuid
index aa49654c6a42c6e2bb249cb4150499a9b14fafa8..1b60255c362e6a23344ceb23fe7ff964c787c96f 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-121308fa869ad490a6924798d276c0ff32759acc
\ No newline at end of file
+7e63089a191f29aefde05e89bb612f3036cfa034
\ No newline at end of file

diff --git a/src/btree.c b/src/btree.c
index a09b82fe5e44b395cdf2a155f3e30002b978c90f..ac13b0f3daee22690d2fdb9622498c49f5741d6c 100644 (file)
--- a/src/btree.c
+++ b/src/btree.c
@@ -1290,28 +1290,30 @@ defragment_page:
 
 /*
 ** Return a section of the pPage->aData to the freelist.
-** The first byte of the new free block is pPage->aDisk[start]
-** and the size of the block is "size" bytes.
+** The first byte of the new free block is pPage->aData[iStart]
+** and the size of the block is iSize bytes.
 **
 ** Most of the effort here is involved in coalesing adjacent
 ** free blocks into a single big free block.
 */
-static int freeSpace(MemPage *pPage, int start, int size){
-  int addr, pbegin, hdr;
-  int iLast;                        /* Largest possible freeblock offset */
-  unsigned char *data = pPage->aData;
+static int freeSpace(MemPage *pPage, int iStart, int iSize){
+  int iPtr;                  /* Address of pointer to next freeblock */
+  int iFreeBlk;              /* Address of the next freeblock */
+  int hdr;                   /* Page header size.  0 or 100 */
+  int iLast;                 /* Largest possible freeblock offset */
+  unsigned char *data = pPage->aData;   /* Page content */
 
   assert( pPage->pBt!=0 );
   assert( sqlite3PagerIswriteable(pPage->pDbPage) );
-  assert( start>=pPage->hdrOffset+6+pPage->childPtrSize );
-  assert( (start + size) <= (int)pPage->pBt->usableSize );
+  assert( iStart>=pPage->hdrOffset+6+pPage->childPtrSize );
+  assert( (iStart + iSize) <= (int)pPage->pBt->usableSize );
   assert( sqlite3_mutex_held(pPage->pBt->mutex) );
-  assert( size>=4 );   /* Minimum cell size is 4 */
+  assert( iSize>=4 );   /* Minimum cell size is 4 */
 
   if( pPage->pBt->btsFlags & BTS_SECURE_DELETE ){
     /* Overwrite deleted information with zeros when the secure_delete
     ** option is enabled */
-    memset(&data[start], 0, size);
+    memset(&data[iStart], 0, iSize);
   }
 
   /* Add the space back into the linked list of freeblocks.  Note that
@@ -1324,53 +1326,56 @@ static int freeSpace(MemPage *pPage, int start, int size){
   ** the freelist.
   */
   hdr = pPage->hdrOffset;
-  addr = hdr + 1;
+  iPtr = hdr + 1;
   iLast = pPage->pBt->usableSize - 4;
-  assert( start<=iLast );
-  while( (pbegin = get2byte(&data[addr]))<start && pbegin>0 ){
-    if( pbegin<addr+4 ){
+  assert( iStart<=iLast );
+  while( (iFreeBlk = get2byte(&data[iPtr]))<iStart && iFreeBlk>0 ){
+    if( iFreeBlk<iPtr+4 ){
       return SQLITE_CORRUPT_BKPT;
     }
-    addr = pbegin;
+    iPtr = iFreeBlk;
   }
-  if( pbegin>iLast ){
+  if( iFreeBlk>iLast ){
     return SQLITE_CORRUPT_BKPT;
   }
-  assert( pbegin>addr || pbegin==0 );
-  put2byte(&data[addr], start);
-  put2byte(&data[start], pbegin);
-  put2byte(&data[start+2], size);
-  pPage->nFree = pPage->nFree + (u16)size;
+  assert( iFreeBlk>iPtr || iFreeBlk==0 );
+  put2byte(&data[iPtr], iStart);
+  put2byte(&data[iStart], iFreeBlk);
+  put2byte(&data[iStart+2], iSize);
+  pPage->nFree = pPage->nFree + (u16)iSize;
 
   /* Coalesce adjacent free blocks */
-  addr = hdr + 1;
-  while( (pbegin = get2byte(&data[addr]))>0 ){
-    int pnext, psize, x;
-    assert( pbegin>addr );
-    assert( pbegin <= (int)pPage->pBt->usableSize-4 );
-    pnext = get2byte(&data[pbegin]);
-    psize = get2byte(&data[pbegin+2]);
-    if( pbegin + psize + 3 >= pnext && pnext>0 ){
-      int frag = pnext - (pbegin+psize);
-      if( (frag<0) || (frag>(int)data[hdr+7]) ){
+  iPtr = hdr + 1;
+  while( (iFreeBlk = get2byte(&data[iPtr]))>0 ){
+    int iNextBlk;      /* Next freeblock after iFreeBlk */
+    int szFreeBlk;     /* Size of iFreeBlk */
+    assert( iFreeBlk>iPtr );
+    assert( iFreeBlk <= (int)pPage->pBt->usableSize-4 );
+    iNextBlk = get2byte(&data[iFreeBlk]);
+    szFreeBlk = get2byte(&data[iFreeBlk+2]);
+    if( iFreeBlk + szFreeBlk + 3 >= iNextBlk && iNextBlk>0 ){
+      int nFrag;     /* Fragment bytes in between iFreeBlk and iNextBlk */
+      int x;         /* Temp value */
+      nFrag = iNextBlk - (iFreeBlk+szFreeBlk);
+      if( (nFrag<0) || (nFrag>(int)data[hdr+7]) ){
         return SQLITE_CORRUPT_BKPT;
       }
-      data[hdr+7] -= (u8)frag;
-      x = get2byte(&data[pnext]);
-      put2byte(&data[pbegin], x);
-      x = pnext + get2byte(&data[pnext+2]) - pbegin;
-      put2byte(&data[pbegin+2], x);
+      data[hdr+7] -= (u8)nFrag;
+      x = get2byte(&data[iNextBlk]);
+      put2byte(&data[iFreeBlk], x);
+      x = iNextBlk + get2byte(&data[iNextBlk+2]) - iFreeBlk;
+      put2byte(&data[iFreeBlk+2], x);
     }else{
-      addr = pbegin;
+      iPtr = iFreeBlk;
     }
   }
 
   /* If the cell content area begins with a freeblock, remove it. */
   if( data[hdr+1]==data[hdr+5] && data[hdr+2]==data[hdr+6] ){
     int top;
-    pbegin = get2byte(&data[hdr+1]);
-    memcpy(&data[hdr+1], &data[pbegin], 2);
-    top = get2byte(&data[hdr+5]) + get2byte(&data[pbegin+2]);
+    iFreeBlk = get2byte(&data[hdr+1]);
+    memcpy(&data[hdr+1], &data[iFreeBlk], 2);
+    top = get2byte(&data[hdr+5]) + get2byte(&data[iFreeBlk+2]);
     put2byte(&data[hdr+5], top);
   }
   assert( sqlite3PagerIswriteable(pPage->pDbPage) );