diff options
| author | drh <drh@noemail.net> | 2009-07-17 11:44:07 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2009-07-17 11:44:07 +0000 |
| commit | f18a61dd5916a2958fa52299041de446ed942261 (patch) | |
| tree | 2d78c922612e2229c41a37ff03d33b392dc621c8 /src/malloc.c | |
| parent | e64ca7ba114c3f3cbb86b7a58df7422af7ad220d (diff) | |
| download | sqlite-f18a61dd5916a2958fa52299041de446ed942261.tar.gz sqlite-f18a61dd5916a2958fa52299041de446ed942261.zip | |
Code simplifications in support of structural testing. (CVS 6900)
FossilOrigin-Name: fb1b955dda5105025ef199880afa871e44331d65
Diffstat (limited to 'src/malloc.c')
| -rw-r--r-- | src/malloc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/malloc.c b/src/malloc.c index 9986f377d..be9093de5 100644 --- a/src/malloc.c +++ b/src/malloc.c @@ -12,7 +12,7 @@ ** ** Memory allocation functions used throughout sqlite. ** -** $Id: malloc.c,v 1.65 2009/07/16 18:21:18 drh Exp $ +** $Id: malloc.c,v 1.66 2009/07/17 11:44:07 drh Exp $ */ #include "sqliteInt.h" #include <stdarg.h> @@ -423,9 +423,7 @@ int sqlite3MallocSize(void *p){ } int sqlite3DbMallocSize(sqlite3 *db, void *p){ assert( db==0 || sqlite3_mutex_held(db->mutex) ); - if( p==0 ){ - return 0; - }else if( isLookaside(db, p) ){ + if( isLookaside(db, p) ){ return db->lookaside.sz; }else{ return sqlite3GlobalConfig.m.xSize(p); |