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

Remove an incorrect assert() statement. Fix a const-related warning.

Browse Source 
FossilOrigin-Name: 96ed47493b3d46344fd2105642f31690aee06674
This commit is contained in:
dan
2012-03-23 14:38:49 +00:00
parent 865e26afa2
commit 3501a91677
4 changed files with 40 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ext/fts3/fts3_write.c
View File

@ -3285,7 +3285,6 @@ static int fts3IncrmergeCsr(
int nByte; /* Bytes allocated at pCsr->apSegment[] */
/* Allocate space for the Fts3MultiSegReader.aCsr[] array */
assert( nSeg>=2 );
memset(pCsr, 0, sizeof(*pCsr));
nByte = sizeof(Fts3SegReader *) * nSeg;
pCsr->apSegment = (Fts3SegReader **)sqlite3_malloc(nByte);
@ -4389,7 +4388,7 @@ static int fts3IncrmergeHintLoad(
if( rc==SQLITE_OK ){
sqlite3_bind_int(pSelect, 1, FTS_STAT_INCRMERGEHINT);
if( SQLITE_ROW==sqlite3_step(pSelect) ){
char *aHint = sqlite3_column_blob(pSelect, 0);
const char *aHint = sqlite3_column_blob(pSelect, 0);
int nHint = sqlite3_column_bytes(pSelect, 0);
if( aHint ){
int i;