diff options
| author | drh <drh@noemail.net> | 2016-02-04 11:48:00 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2016-02-04 11:48:00 +0000 |
| commit | 4df86af329e606e8c92d5d41a8874e30ebb226cb (patch) | |
| tree | baf725180612e124e0b553217b8472a62a81062d /src | |
| parent | c4703eedab614f8b4e5e8173ac78e8507439a556 (diff) | |
| download | sqlite-4df86af329e606e8c92d5d41a8874e30ebb226cb.tar.gz sqlite-4df86af329e606e8c92d5d41a8874e30ebb226cb.zip | |
Remove unnecessary sets of db->mallocFailed.
FossilOrigin-Name: b787165b25a240fd5b4a5c7f73b395f30213a1d7
Diffstat (limited to 'src')
| -rw-r--r-- | src/alter.c | 2 | ||||
| -rw-r--r-- | src/btree.c | 1 | ||||
| -rw-r--r-- | src/build.c | 2 | ||||
| -rw-r--r-- | src/wherecode.c | 4 |
4 files changed, 3 insertions, 6 deletions
diff --git a/src/alter.c b/src/alter.c index c8102c55d..16b7a9e19 100644 --- a/src/alter.c +++ b/src/alter.c @@ -803,7 +803,7 @@ void sqlite3AlterBeginAddColumn(Parse *pParse, SrcList *pSrc){ pNew->aCol = (Column*)sqlite3DbMallocZero(db, sizeof(Column)*nAlloc); pNew->zName = sqlite3MPrintf(db, "sqlite_altertab_%s", pTab->zName); if( !pNew->aCol || !pNew->zName ){ - db->mallocFailed = 1; + assert( db->mallocFailed ); goto exit_begin_add_column; } memcpy(pNew->aCol, pTab->aCol, sizeof(Column)*pNew->nCol); diff --git a/src/btree.c b/src/btree.c index d5acaf366..b99820ddb 100644 --- a/src/btree.c +++ b/src/btree.c @@ -2338,7 +2338,6 @@ int sqlite3BtreeOpen( pBt->mutex = sqlite3MutexAlloc(SQLITE_MUTEX_FAST); if( pBt->mutex==0 ){ rc = SQLITE_NOMEM; - db->mallocFailed = 0; goto btree_open_out; } } diff --git a/src/build.c b/src/build.c index 3ca4c9994..cea05d51c 100644 --- a/src/build.c +++ b/src/build.c @@ -926,7 +926,7 @@ void sqlite3StartTable( pTable = sqlite3DbMallocZero(db, sizeof(Table)); if( pTable==0 ){ - db->mallocFailed = 1; + assert( db->mallocFailed ); pParse->rc = SQLITE_NOMEM; pParse->nErr++; goto begin_table_error; diff --git a/src/wherecode.c b/src/wherecode.c index f5f45da39..bb48e5dc7 100644 --- a/src/wherecode.c +++ b/src/wherecode.c @@ -495,9 +495,7 @@ static int codeAllEqualityTerms( pParse->nMem += nReg; zAff = sqlite3DbStrDup(pParse->db,sqlite3IndexAffinityStr(pParse->db,pIdx)); - if( !zAff ){ - pParse->db->mallocFailed = 1; - } + assert( zAff!=0 || pParse->db->mallocFailed ); if( nSkip ){ int iIdxCur = pLevel->iIdxCur; |