mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence a harmless unitialised variable warning in btree.c. Ticket #2862. (CVS 4650)

Browse Source 
FossilOrigin-Name: b51782ccac28598eec7adc9302fe7d1986bfdaf8
This commit is contained in:
danielk1977 2008-01-01 06:19:02 +00:00
parent 7c9aaa7058
commit 8ea1cfaa9a
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifest
View File

@ -1,5 +1,5 @@
C Define\sSQLITE_CORE=1\sat\sthe\sstart\sof\sthe\samalgamation\sfile\sfor\sthe\sbenefit\sof\sany\sextension\ssource\scode\s(i.e.\sfts3)\sappended\sto\sit.\sTicket\s#2858.\s(CVS\s4649)
D 2008-01-01T05:49:08
C Silence\sa\sharmless\sunitialised\svariable\swarning\sin\sbtree.c.\sTicket\s#2862.\s(CVS\s4650)
D 2008-01-01T06:19:02
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in 30789bf70614bad659351660d76b8e533f3340e9
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -83,7 +83,7 @@ F src/analyze.c fd1a3d756c1a20fca3c505bed0398f4cdca83cb8
F src/attach.c 95658e74e3e0d1cbdb8658817516d4d1467fc13d
F src/auth.c c8b2ab5c8bad4bd90ed7c294694f48269162c627
F src/btmutex.c 5d39da37c9d1282f3c6f9967afae6a34ee36b7ff
F src/btree.c bef8ceec858b167bd0ce0863fe0bdd527126c213
F src/btree.c 6c3ded4f31046de72993a440921ad50a7eb4a65d
F src/btree.h 19dcf5ad23c17b98855da548e9a8e3eb4429d5eb
F src/btreeInt.h 1c5a9da165718ef7de81e35ce9ab5d9ba9283f76
F src/build.c cbfd98ceb95c61c226cd60a845fa7967b66c8931
@ -602,7 +602,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 9719a063942256e34395868d974ed2d53b81b697
R 9be79ed58ebd0f628a8fa2891c3b46c3
P 6dea8c16384443ed4ab59d1e2694534992ec3118
R 782ae7c60f2ef919b3a8af5b140614e6
U danielk1977
Z 83c9ac93b067590bdb714d00af8d91e3
Z 52c90bef75d1e50f96fdd91d4d73d155

2
manifest.uuid
View File

@ -1 +1 @@
6dea8c16384443ed4ab59d1e2694534992ec3118
b51782ccac28598eec7adc9302fe7d1986bfdaf8

28
src/btree.c
View File

@ -9,7 +9,7 @@
** May you share freely, never taking more than you give.
**
*************************************************************************
** $Id: btree.c,v 1.434 2007/12/21 04:47:26 danielk1977 Exp $
** $Id: btree.c,v 1.435 2008/01/01 06:19:02 danielk1977 Exp $
**
** This file implements a external (disk-based) database using BTrees.
** See the header comment on "btreeInt.h" for additional information.
@ -5729,9 +5729,6 @@ int sqlite3BtreeDelete(BtCursor *pCur){
*/
BtCursor leafCur;
unsigned char *pNext;
int szNext; /* The compiler warning is wrong: szNext is always
** initialized before use. Adding an extra initialization
** to silence the compiler slows down the code. */
int notUsed;
unsigned char *tempCell = 0;
assert( !pPage->leafData );
@ -5741,6 +5738,7 @@ int sqlite3BtreeDelete(BtCursor *pCur){
rc = sqlite3PagerWrite(leafCur.pPage->pDbPage);
}
if( rc==SQLITE_OK ){
int szNext;
TRACE(("DELETE: table=%d delete internal from %d replace from leaf %d\n",
pCur->pgnoRoot, pPage->pgno, leafCur.pPage->pgno));
dropCell(pPage, pCur->idx, cellSizePtr(pPage, pCell));
@ -5751,17 +5749,17 @@ int sqlite3BtreeDelete(BtCursor *pCur){
if( tempCell==0 ){
rc = SQLITE_NOMEM;
}
}
if( rc==SQLITE_OK ){
rc = insertCell(pPage, pCur->idx, pNext-4, szNext+4, tempCell, 0);
}
if( rc==SQLITE_OK ){
put4byte(findOverflowCell(pPage, pCur->idx), pgnoChild);
rc = balance(pPage, 0);
}
if( rc==SQLITE_OK ){
dropCell(leafCur.pPage, leafCur.idx, szNext);
rc = balance(leafCur.pPage, 0);
if( rc==SQLITE_OK ){
rc = insertCell(pPage, pCur->idx, pNext-4, szNext+4, tempCell, 0);
}
if( rc==SQLITE_OK ){
put4byte(findOverflowCell(pPage, pCur->idx), pgnoChild);
rc = balance(pPage, 0);
}
if( rc==SQLITE_OK ){
dropCell(leafCur.pPage, leafCur.idx, szNext);
rc = balance(leafCur.pPage, 0);
}
}
sqlite3_free(tempCell);
sqlite3BtreeReleaseTempCursor(&leafCur);