database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-08-07 02:42:48 +03:00
Code Activity

Remove a few duplicate variable initializations in sqlite3BtreeCursor(). (CVS 2937)

Browse Source 
FossilOrigin-Name: 5e46ec01ff3fe8654fc267efbb12d2d1b01c48aa
This commit is contained in:
danielk1977
2006-01-13 11:22:07 +00:00
parent e725929686
commit 1fef7d5d3f
4 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C Minor\smodification\sto\srestoreOrClearCursorPosition()\sto\simprove\sefficiency.\sDo\snot\sallocate\sthe\sextra\s8-bytes\sif\smemory-management\sis\snot\senabled.\s(CVS\s2936) C Remove\sa\sfew\sduplicate\svariable\sinitializations\sin\ssqlite3BtreeCursor().\s(CVS\s2937)
D 2006-01-13T06:33:24 D 2006-01-13T11:22:07
F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967 F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092 F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -34,7 +34,7 @@ F src/alter.c 4139c8f1d0f12b1759e767b1d09dd594e2b5ac1d
F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a F src/analyze.c 7d2b7ab9a9c2fd6e55700f69064dfdd3e36d7a8a
F src/attach.c d4b9d8bd71d72409720946355be41cafb6c09079 F src/attach.c d4b9d8bd71d72409720946355be41cafb6c09079
F src/auth.c cdec356a5cd8b217c346f816c5912221537fe87f F src/auth.c cdec356a5cd8b217c346f816c5912221537fe87f
F src/btree.c 46061b59a71da48fb269a3ac318f560fe5c4f449 F src/btree.c fe2bdc08a1fc5847eb7eebfce5251558440dcc28
F src/btree.h 5663c4f43e8521546ccebc8fc95acb013b8f3184 F src/btree.h 5663c4f43e8521546ccebc8fc95acb013b8f3184
F src/build.c 6db3dcb70ae17dcd303493c021e6dd233217828f F src/build.c 6db3dcb70ae17dcd303493c021e6dd233217828f
F src/callback.c ba3e6cc7a6beb562e7a66f92e26fabcb21aab1e2 F src/callback.c ba3e6cc7a6beb562e7a66f92e26fabcb21aab1e2
@@ -52,7 +52,7 @@ F src/main.c 39d073fb1f95f874ee0c98366e99005cf14742dd
F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217 F src/md5.c c5fdfa5c2593eaee2e32a5ce6c6927c986eaf217
F src/os.c 1d1a61cdf150e9f9520a3bc787c8465148ea2e78 F src/os.c 1d1a61cdf150e9f9520a3bc787c8465148ea2e78
F src/os.h 9debc3d3ca4cdafde222a0ea74a4c8415aef4f22 F src/os.h 9debc3d3ca4cdafde222a0ea74a4c8415aef4f22
F src/os_common.h 44783a37f78ab6e0dd5fa156530dbc58beadbba6 F src/os_common.h 6b76efa9b252e288de53b202ed5a0d48f48dc8db
F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c bc35a237a10c2ecb5c5b038d31d20ecb098dcc7d F src/os_unix.c bc35a237a10c2ecb5c5b038d31d20ecb098dcc7d
@@ -340,7 +340,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
P 48b550ce2ea43c7c1c59cd43d0008ba18fc0215b P dd705955429d847af85ffaf248976bcd1d861852
R 6c60b8d6c2a158ae481c8f06f49dfdff R 40dd1503ed21c91f3caf35fc59e72104
U danielk1977 U danielk1977
Z 1089e014c07372cc03784a37d45ba046 Z 69d38632915b9f5de07c1fb25a99a6fb

2
manifest.uuid
View File

@@ -1 +1 @@
dd705955429d847af85ffaf248976bcd1d861852 5e46ec01ff3fe8654fc267efbb12d2d1b01c48aa

6
src/btree.c
View File

@@ -9,7 +9,7 @@
** May you share freely, never taking more than you give. ** May you share freely, never taking more than you give.
** **
************************************************************************* *************************************************************************
** $Id: btree.c,v 1.296 2006/01/13 06:33:24 danielk1977 Exp $ ** $Id: btree.c,v 1.297 2006/01/13 11:22:07 danielk1977 Exp $
** **
** This file implements a external (disk-based) database using BTrees. ** This file implements a external (disk-based) database using BTrees.
** For a detailed discussion of BTrees, refer to ** For a detailed discussion of BTrees, refer to
@@ -2711,7 +2711,6 @@ int sqlite3BtreeCursor(
goto create_cursor_exception; goto create_cursor_exception;
} }
pCur->pgnoRoot = (Pgno)iTable; pCur->pgnoRoot = (Pgno)iTable;
pCur->pPage = 0; /* For exit-handler, in case getAndInitPage() fails. */
if( iTable==1 && sqlite3pager_pagecount(pBt->pPager)==0 ){ if( iTable==1 && sqlite3pager_pagecount(pBt->pPager)==0 ){
rc = SQLITE_EMPTY; rc = SQLITE_EMPTY;
goto create_cursor_exception; goto create_cursor_exception;
@@ -2729,13 +2728,10 @@ int sqlite3BtreeCursor(
pCur->pArg = pArg; pCur->pArg = pArg;
pCur->pBtree = p; pCur->pBtree = p;
pCur->wrFlag = wrFlag; pCur->wrFlag = wrFlag;
pCur->idx = 0;
memset(&pCur->info, 0, sizeof(pCur->info));
pCur->pNext = pBt->pCursor; pCur->pNext = pBt->pCursor;
if( pCur->pNext ){ if( pCur->pNext ){
pCur->pNext->pPrev = pCur; pCur->pNext->pPrev = pCur;
} }
pCur->pPrev = 0;
pBt->pCursor = pCur; pBt->pCursor = pCur;
pCur->eState = CURSOR_INVALID; pCur->eState = CURSOR_INVALID;
*ppCur = pCur; *ppCur = pCur;

12
src/os_common.h
View File

@@ -132,8 +132,16 @@ int sqlite3_open_file_count = 0;
** Implementation of the os level dynamic memory allocation interface in terms ** Implementation of the os level dynamic memory allocation interface in terms
** of the standard malloc(), realloc() and free() found in many operating ** of the standard malloc(), realloc() and free() found in many operating
** systems. No rocket science here. ** systems. No rocket science here.
**
** There are two versions of these four functions here. The version
** implemented here is only used if memory-management or memory-debugging is
** enabled. This version allocates an extra 8-bytes at the beginning of each
** block and stores the size of the allocation there.
**
** If neither memory-management or debugging is enabled, the second
** set of implementations is used instead.
*/ */
#ifdef SQLITE_ENABLE_MEMORY_MANAGEMENT #if defined(SQLITE_ENABLE_MEMORY_MANAGEMENT) || defined (SQLITE_MEMDEBUG)
void *sqlite3GenericMalloc(int n){ void *sqlite3GenericMalloc(int n){
char *p = (char *)malloc(n+8); char *p = (char *)malloc(n+8);
assert(n>0); assert(n>0);
@@ -173,7 +181,9 @@ void sqlite3GenericFree(void *p){
assert(p); assert(p);
free(p); free(p);
} }
#if 0 /* Never actually invoked */
int sqlite3GenericAllocationSize(void *p){ int sqlite3GenericAllocationSize(void *p){
assert(0); assert(0);
} }
#endif #endif
#endif