aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordrh <drh@noemail.net>2020-05-17 00:26:44 +0000
committerdrh <drh@noemail.net>2020-05-17 00:26:44 +0000
commitd924e7bc78a4ca604bce0f8d9d0390d3feddba01 (patch)
tree4aa5c32ecc352491e28610d579f135a92e0a448a /src
parentb2eb7e46eb3c0a1611d7777fb3a1ba9b30f56ea5 (diff)
downloadsqlite-d924e7bc78a4ca604bce0f8d9d0390d3feddba01.tar.gz
sqlite-d924e7bc78a4ca604bce0f8d9d0390d3feddba01.zip
Use the sqlite3Realloc() interface internally, rather than the public
sqlite3_realloc64() equivalent, to avoid unnecessary calls to sqlite3_initialize(). FossilOrigin-Name: 1313557b512297e7b75ed748894379b2022aecf696d5a58318e46a668321c1ff
Diffstat (limited to 'src')
-rw-r--r--src/func.c2
-rw-r--r--src/malloc.c2
-rw-r--r--src/memdb.c2
-rw-r--r--src/printf.c2
-rw-r--r--src/table.c4
-rw-r--r--src/vtab.c2
-rw-r--r--src/wal.c2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/func.c b/src/func.c
index f50fa1986..48b5f5f19 100644
--- a/src/func.c
+++ b/src/func.c
@@ -1283,7 +1283,7 @@ static void replaceFunc(
** whose index is a power of two: 1, 2, 4, 8, 16, 32, ... */
u8 *zOld;
zOld = zOut;
- zOut = sqlite3_realloc64(zOut, (int)nOut + (nOut - nStr - 1));
+ zOut = sqlite3Realloc(zOut, (int)nOut + (nOut - nStr - 1));
if( zOut==0 ){
sqlite3_result_error_nomem(context);
sqlite3_free(zOld);
diff --git a/src/malloc.c b/src/malloc.c
index b7378099a..577836ef9 100644
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -672,7 +672,7 @@ static SQLITE_NOINLINE void *dbReallocFinish(sqlite3 *db, void *p, u64 n){
assert( sqlite3MemdebugHasType(p, (MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
assert( sqlite3MemdebugNoType(p, (u8)~(MEMTYPE_LOOKASIDE|MEMTYPE_HEAP)) );
sqlite3MemdebugSetType(p, MEMTYPE_HEAP);
- pNew = sqlite3_realloc64(p, n);
+ pNew = sqlite3Realloc(p, n);
if( !pNew ){
sqlite3OomFault(db);
}
diff --git a/src/memdb.c b/src/memdb.c
index 2ddecae72..aabac5226 100644
--- a/src/memdb.c
+++ b/src/memdb.c
@@ -166,7 +166,7 @@ static int memdbEnlarge(MemFile *p, sqlite3_int64 newSz){
}
newSz *= 2;
if( newSz>p->szMax ) newSz = p->szMax;
- pNew = sqlite3_realloc64(p->aData, newSz);
+ pNew = sqlite3Realloc(p->aData, newSz);
if( pNew==0 ) return SQLITE_NOMEM;
p->aData = pNew;
p->szAlloc = newSz;
diff --git a/src/printf.c b/src/printf.c
index a7d1b2f9d..fd42bd2bc 100644
--- a/src/printf.c
+++ b/src/printf.c
@@ -924,7 +924,7 @@ static int sqlite3StrAccumEnlarge(StrAccum *p, int N){
if( p->db ){
zNew = sqlite3DbRealloc(p->db, zOld, p->nAlloc);
}else{
- zNew = sqlite3_realloc64(zOld, p->nAlloc);
+ zNew = sqlite3Realloc(zOld, p->nAlloc);
}
if( zNew ){
assert( p->zText!=0 || p->nChar==0 );
diff --git a/src/table.c b/src/table.c
index c79255f99..db60a827a 100644
--- a/src/table.c
+++ b/src/table.c
@@ -56,7 +56,7 @@ static int sqlite3_get_table_cb(void *pArg, int nCol, char **argv, char **colv){
if( p->nData + need > p->nAlloc ){
char **azNew;
p->nAlloc = p->nAlloc*2 + need;
- azNew = sqlite3_realloc64( p->azResult, sizeof(char*)*p->nAlloc );
+ azNew = sqlite3Realloc( p->azResult, sizeof(char*)*p->nAlloc );
if( azNew==0 ) goto malloc_failed;
p->azResult = azNew;
}
@@ -165,7 +165,7 @@ int sqlite3_get_table(
}
if( res.nAlloc>res.nData ){
char **azNew;
- azNew = sqlite3_realloc64( res.azResult, sizeof(char*)*res.nData );
+ azNew = sqlite3Realloc( res.azResult, sizeof(char*)*res.nData );
if( azNew==0 ){
sqlite3_free_table(&res.azResult[1]);
db->errCode = SQLITE_NOMEM;
diff --git a/src/vtab.c b/src/vtab.c
index 013511cfb..d94f6b5ed 100644
--- a/src/vtab.c
+++ b/src/vtab.c
@@ -1177,7 +1177,7 @@ void sqlite3VtabMakeWritable(Parse *pParse, Table *pTab){
if( pTab==pToplevel->apVtabLock[i] ) return;
}
n = (pToplevel->nVtabLock+1)*sizeof(pToplevel->apVtabLock[0]);
- apVtabLock = sqlite3_realloc64(pToplevel->apVtabLock, n);
+ apVtabLock = sqlite3Realloc(pToplevel->apVtabLock, n);
if( apVtabLock ){
pToplevel->apVtabLock = apVtabLock;
pToplevel->apVtabLock[pToplevel->nVtabLock++] = pTab;
diff --git a/src/wal.c b/src/wal.c
index 115db09cd..e8f7f24f8 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -568,7 +568,7 @@ static SQLITE_NOINLINE int walIndexPageRealloc(
if( pWal->nWiData<=iPage ){
sqlite3_int64 nByte = sizeof(u32*)*(iPage+1);
volatile u32 **apNew;
- apNew = (volatile u32 **)sqlite3_realloc64((void *)pWal->apWiData, nByte);
+ apNew = (volatile u32 **)sqlite3Realloc((void *)pWal->apWiData, nByte);
if( !apNew ){
*ppPage = 0;
return SQLITE_NOMEM_BKPT;