Add fuzzcheck to all makefiles and fix compiler warnings.

FossilOrigin-Name: 7b3d21906a9650377cda56b94facdff75b2cb858
This commit is contained in:
drh 2015-05-25 22:29:26 +00:00
parent 370cf73c4f
commit 1573dc3bb1
5 changed files with 20 additions and 14 deletions

View File

@ -556,6 +556,9 @@ sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
fuzzershell$(TEXE): $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h
$(LTLINK) -o $@ $(TOP)/tool/fuzzershell.c sqlite3.c $(TLIBS)
fuzzcheck$(TEXE): $(TOP)/test/fuzzcheck.c sqlite3.c sqlite3.h
$(LTLINK) -o $@ $(TOP)/test/fuzzcheck.c sqlite3.c $(TLIBS)
mptester$(TEXE): sqlite3.c $(TOP)/mptest/mptest.c
$(LTLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.c \
$(TLIBS) -rpath "$(libdir)"

View File

@ -1212,6 +1212,9 @@ sqldiff.exe: $(TOP)\tool\sqldiff.c sqlite3.c sqlite3.h
fuzzershell.exe: $(TOP)\tool\fuzzershell.c sqlite3.c sqlite3.h
$(LTLINK) $(TOP)\tool\fuzzershell.c sqlite3.c
fuzzcheck.exe: $(TOP)\test\fuzzcheck.c sqlite3.c sqlite3.h
$(LTLINK) $(TOP)\test\fuzzcheck.c sqlite3.c
mptester.exe: $(TOP)\mptest\mptest.c $(SHELL_CORE_DEP) $(LIBRESOBJS) sqlite3.h
$(LTLINK) $(SHELL_COMPILE_OPTS) $(TOP)\mptest\mptest.c \
/link $(LTLINKOPTS) $(LTLIBPATHS) $(SHELL_LINK_OPTS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)

View File

@ -1,9 +1,9 @@
C Merge\sin\strunk\sfixes.
D 2015-05-25T22:18:33.572
C Add\sfuzzcheck\sto\sall\smakefiles\sand\sfix\scompiler\swarnings.
D 2015-05-25T22:29:26.027
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in 0a6ae26396ec696221021780dffbb894ff3cead7
F Makefile.in 411b8dc7191769de8b1ddd5c4d83bcf2e37ed5e4
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
F Makefile.msc 55fdbee85598e2c61fc1e643d02f38f1f943463c
F Makefile.msc 5a063468f5785e6823104f2adcfe2cd3331fa812
F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
F README.md 0bfccb18927349653c09137a458b961fa8ab4cb9
F VERSION ce0ae95abd7121c534f6917c1c8f2b70d9acd4db
@ -651,7 +651,7 @@ F test/fuzz2.test 76dc35b32b6d6f965259508508abce75a6c4d7e1
F test/fuzz3.test efd384b896c647b61a2c1848ba70d42aad60a7b3
F test/fuzz_common.tcl a87dfbb88c2a6b08a38e9a070dabd129e617b45b
F test/fuzz_malloc.test 328f70aaca63adf29b4c6f06505ed0cf57ca7c26
F test/fuzzcheck.c e751524648c8cba541ecaefe102dfb32012a447b
F test/fuzzcheck.c 2235e5713384b38165d3caf9877f59502b0aeeb4
F test/fuzzdata1.txt 9fceb50868e0b798160e83742bd7e44e457176a0
F test/fuzzdata2.txt ba9b4467d7ec46cc85d32c0d031540cd727ae6ad
F test/fuzzer1.test d4c52aaf3ef923da293a2653cfab33d02f718a36
@ -1279,7 +1279,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 864bfdbfe7b196cc9df2136b15a28e2a0f2713cb 7d2c4f7b6695806ab8ce0c6f49d8bc1d77a4320b
R 9f4c15449a7a5268b20bd4afaa94ba40
P c71c2e1a991775e1711e9621a59dd8a60eec329b
R 00e95d3d9ed40a5829d3d01e66cda04a
U drh
Z 4b2b2637896560e00230932f0089f20d
Z 8427b6751d3d61b1b2cf041618f18fc4

View File

@ -1 +1 @@
c71c2e1a991775e1711e9621a59dd8a60eec329b
7b3d21906a9650377cda56b94facdff75b2cb858

View File

@ -324,7 +324,7 @@ static int inmemRead(
}
if( iOfst+iAmt>pVFile->sz ){
memset(pData, 0, iAmt);
iAmt = pVFile->sz - iOfst;
iAmt = (int)(pVFile->sz - iOfst);
memcpy(pData, pVFile->a, iAmt);
return SQLITE_IOERR_SHORT_READ;
}
@ -343,9 +343,9 @@ static int inmemWrite(
if( iOfst+iAmt >= MX_FILE_SZ ){
return SQLITE_FULL;
}
pVFile->a = safe_realloc(pVFile->a, iOfst+iAmt);
memset(pVFile->a + pVFile->sz, 0, iOfst - pVFile->sz);
pVFile->sz = iOfst + iAmt;
pVFile->a = safe_realloc(pVFile->a, (int)(iOfst+iAmt));
memset(pVFile->a + pVFile->sz, 0, (int)(iOfst - pVFile->sz));
pVFile->sz = (int)(iOfst + iAmt);
}
memcpy(pVFile->a + iOfst, pData, iAmt);
return SQLITE_OK;
@ -353,7 +353,7 @@ static int inmemWrite(
static int inmemTruncate(sqlite3_file *pFile, sqlite3_int64 iSize){
VHandle *pHandle = (VHandle*)pFile;
VFile *pVFile = pHandle->pVFile;
if( pVFile->sz>iSize && iSize>=0 ) pVFile->sz = iSize;
if( pVFile->sz>iSize && iSize>=0 ) pVFile->sz = (int)iSize;
return SQLITE_OK;
}
static int inmemSync(sqlite3_file *pFile, int flags){