Add an assert() in order to calm a scan-build warning.

FossilOrigin-Name: 11e81ac2a7c917f7c9afc218d104d9870daf9668
This commit is contained in:
drh
2015-01-12 17:56:06 +00:00
parent 8567d40609
commit 8d9da63dac
3 changed files with 8 additions and 7 deletions
+6 -6
View File
@@ -1,5 +1,5 @@
C Add\sdetection\sof\sthe\sisnan()\slibrary\sfunction\sto\sthe\sconfigure\sscript.\s\sMake\nthe\scode\sresponsive\sto\sthe\sHAVE_ISNAN\sconfiguration\soption.
D 2015-01-10T18:22:06.081
C Add\san\sassert()\sin\sorder\sto\scalm\sa\sscan-build\swarning.
D 2015-01-12T17:56:06.382
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 876093578650b28af50a20c819993ee779885adb
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -298,7 +298,7 @@ F src/vdbeapi.c 4bc511a46b9839392ae0e90844a71dc96d9dbd71
F src/vdbeaux.c 07ef87c6d4b5abdf13ff33babb10205702fdab0a
F src/vdbeblob.c 4af4bfb71f6df7778397b4a0ebc1879793276778
F src/vdbemem.c 31d8eabb0cd78bfeab4e5124c7363c3e9e54db9f
F src/vdbesort.c 560bdfd9eb3ae3205196e0d64ccd1de925caa6c7
F src/vdbesort.c 6d64c5448b64851b99931ede980addc3af70d5e2
F src/vdbetrace.c 7e4222955e07dd707a2f360c0eb73452be1cb010
F src/vtab.c c08ec66f45919eaa726bf88aa53eb08379d607f9
F src/wal.c 85353539f2d9d0c91ebd057c32525b1e1aa3335e
@@ -1235,7 +1235,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
P 694228e4632c2999efa47ecb49f679c177db02e5
R 332805e27e3ffd90d9186edc59ab2f6e
P 46f3aba2692d74c29ab5c1f24a6daac600fd6af8
R 92ea1bf6542c9d9c7faa1f3f4f13619f
U drh
Z 73760a179fa08b38d3fe890bfb333a58
Z e7423f8002cbebe040ecb69ba833d201
+1 -1
View File
@@ -1 +1 @@
46f3aba2692d74c29ab5c1f24a6daac600fd6af8
11e81ac2a7c917f7c9afc218d104d9870daf9668
+1
View File
@@ -2414,6 +2414,7 @@ int sqlite3VdbeSorterNext(sqlite3 *db, const VdbeCursor *pCsr, int *pbEof){
}else
#endif
/*if( !pSorter->bUseThreads )*/ {
assert( pSorter->pMerger!=0 );
assert( pSorter->pMerger->pTask==(&pSorter->aTask[0]) );
rc = vdbeMergeEngineStep(pSorter->pMerger, pbEof);
}