From c86caa58cd4f101417f6130f58a537c8cbaf6573 Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 27 Jan 2018 03:26:10 +0000 Subject: [PATCH] Fix compiler warnings in zipfile.c. FossilOrigin-Name: bed610d99b5322ee209b06966c0086e8c55f8a82be8d7693cfdeb4d728679721 --- ext/misc/zipfile.c | 8 ++------ manifest | 12 ++++++------ manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c index c199f8ec1b..61e60f63d2 100644 --- a/ext/misc/zipfile.c +++ b/ext/misc/zipfile.c @@ -504,10 +504,6 @@ static void zipfilePutU32(u8 *aBuf, u32 val){ #define zipfileWrite32(aBuf,val) { zipfilePutU32(aBuf,val); aBuf+=4; } #define zipfileWrite16(aBuf,val) { zipfilePutU16(aBuf,val); aBuf+=2; } -static u8* zipfileCsrBuffer(ZipfileCsr *pCsr){ - return ((ZipfileTab*)(pCsr->base.pVtab))->aBuffer; -} - /* ** Magic numbers used to read CDS records. */ @@ -649,7 +645,7 @@ static int zipfileGetEntry( int rc = SQLITE_OK; if( aBlob==0 ){ - aRead = pTab->aBuffer; + aRead = (u8*)pTab->aBuffer; rc = zipfileReadData(pFile, aRead, ZIPFILE_CDS_FIXED_SZ, iOff, pzErr); }else{ aRead = (u8*)&aBlob[iOff]; @@ -703,7 +699,7 @@ static int zipfileGetEntry( if( pFile ){ rc = zipfileReadData(pFile, aRead, szFix, pNew->cds.iOffset, pzErr); }else{ - aRead = &aBlob[pNew->cds.iOffset]; + aRead = (u8*)&aBlob[pNew->cds.iOffset]; } rc = zipfileReadLFH(aRead, &lfh); diff --git a/manifest b/manifest index d9b3091b28..0e0a71deef 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sthe\squery\splanner\sso\sthat\sit\stakes\sinto\saccount\sdependencies\sin\sthe\narguments\sto\stable-valued\sfunctions\sin\ssubexpressions\sin\sthe\sWHERE\sclause.\nFix\sfor\sticket\s[80177f0c226ff54f6dd]. -D 2018-01-26T22:41:59.788 +C Fix\scompiler\swarnings\sin\szipfile.c. +D 2018-01-27T03:26:10.457 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 7a3f714b4fcf793108042b7b0a5c720b0b310ec84314d61ba7f3f49f27e550ea @@ -304,7 +304,7 @@ F ext/misc/vfsstat.c bf10ef0bc51e1ad6756629e1edb142f7a8db1178 F ext/misc/vtablog.c 31d0d8f4406795679dcd3a67917c213d3a2a5fb3ea5de35f6e773491ed7e13c9 F ext/misc/vtshim.c 1976e6dd68dd0d64508c91a6dfab8e75f8aaf6cd F ext/misc/wholenumber.c 784b12543d60702ebdd47da936e278aa03076212 -F ext/misc/zipfile.c 071fb5af4d0e6403f01cfac755d78ed2008b04793ec6f87a1078755a6359a26f +F ext/misc/zipfile.c 40195c1cfb43e0ebdf176d37346fea1cb18246e35fbfce477eadc2ff5f7490df F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842 F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee @@ -1702,7 +1702,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 029ebcd30cb261d949f7587ac54c23d7479796b6716fd4ca7512361b8f32de3e -R 53bd80b0955af3fa0129a178c0e00c7d +P 7daa687340e475972d6849f84fe1419a1f5700934f53fd80656849adc73d6d04 +R db0d53a567e4f3bfdfebf8c5b2a2a369 U drh -Z 5dfc01b033acb2ff4461347ae9c97b23 +Z 1789fd20b7b2fb64dfc10fb2cef79caf diff --git a/manifest.uuid b/manifest.uuid index 45ee5fd82d..98506da2d8 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7daa687340e475972d6849f84fe1419a1f5700934f53fd80656849adc73d6d04 \ No newline at end of file +bed610d99b5322ee209b06966c0086e8c55f8a82be8d7693cfdeb4d728679721 \ No newline at end of file