diff options
| author | drh <drh@noemail.net> | 2008-06-15 02:51:47 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2008-06-15 02:51:47 +0000 |
| commit | e5ae5735c0abbd832e12a9633d1a10e9074bf82a (patch) | |
| tree | dd8af64eb83c92bd4b226f3ae983d19ad9cb7b42 /src/printf.c | |
| parent | fec00eabb3c144813164c9f04cc0fffd93c45247 (diff) | |
| download | sqlite-e5ae5735c0abbd832e12a9633d1a10e9074bf82a.tar.gz sqlite-e5ae5735c0abbd832e12a9633d1a10e9074bf82a.zip | |
Continuing work on the new memory allocation subsystem.
Added routines for temporary memory allocation. Right the btree
balance mechanism to only do one temporary allocation at a time. (CVS 5220)
FossilOrigin-Name: 65fe7b62cfe7d11cd667681a64c96fe7b2fe5685
Diffstat (limited to 'src/printf.c')
| -rw-r--r-- | src/printf.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/printf.c b/src/printf.c index 333765a53..d0b219a41 100644 --- a/src/printf.c +++ b/src/printf.c @@ -5,7 +5,7 @@ ** an historical reference. Most of the "enhancements" have been backed ** out so that the functionality is now the same as standard printf(). ** -** $Id: printf.c,v 1.85 2008/05/16 04:51:55 danielk1977 Exp $ +** $Id: printf.c,v 1.86 2008/06/15 02:51:48 drh Exp $ ** ************************************************************************** ** @@ -650,7 +650,7 @@ static void vxprintf( needQuote = !isnull && xtype==etSQLESCAPE2; n += i + 1 + needQuote*2; if( n>etBUFSIZE ){ - bufpt = zExtra = sqlite3_malloc( n ); + bufpt = zExtra = sqlite3Malloc( n ); if( bufpt==0 ) return; }else{ bufpt = buf; @@ -752,7 +752,7 @@ void sqlite3StrAccumAppend(StrAccum *p, const char *z, int N){ }else{ p->nAlloc = szNew; } - zNew = sqlite3_malloc( p->nAlloc ); + zNew = sqlite3Malloc( p->nAlloc ); if( zNew ){ memcpy(zNew, p->zText, p->nChar); sqlite3StrAccumReset(p); @@ -777,7 +777,7 @@ char *sqlite3StrAccumFinish(StrAccum *p){ if( p->zText ){ p->zText[p->nChar] = 0; if( p->useMalloc && p->zText==p->zBase ){ - p->zText = sqlite3_malloc( p->nChar+1 ); + p->zText = sqlite3Malloc( p->nChar+1 ); if( p->zText ){ memcpy(p->zText, p->zBase, p->nChar+1); }else{ |