From eb545004193ed95aa41213b8aa24496e158085ac Mon Sep 17 00:00:00 2001 From: drh Date: Sat, 13 Jan 2018 23:28:33 +0000 Subject: [PATCH] Fix harmless compiler warnings in zipfile.c. FossilOrigin-Name: 8f7a592f8c044d75b4615a95e27454100b10c2b26f4cafee97dec23343821130 --- ext/misc/zipfile.c | 3 +-- manifest | 14 +++++++------- manifest.uuid | 2 +- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ext/misc/zipfile.c b/ext/misc/zipfile.c index 88b7403f82..63828e3c09 100644 --- a/ext/misc/zipfile.c +++ b/ext/misc/zipfile.c @@ -1278,7 +1278,7 @@ static int zipfileUpdate( if( sqlite3_value_type(apVal[0])!=SQLITE_NULL ){ const char *zDelete = (const char*)sqlite3_value_text(apVal[0]); - int nDelete = strlen(zDelete); + int nDelete = (int)strlen(zDelete); for(pOld=pTab->pFirstEntry; 1; pOld=pOld->pNext){ if( pOld->bDeleted ) continue; if( zipfileComparePath(pOld->zPath, zDelete, nDelete)==0 ){ @@ -1295,7 +1295,6 @@ static int zipfileUpdate( ){ /* Reuse the data from the existing entry. */ FILE *pFile = pTab->pWriteFd; - ZipfileCDS cds; zipfileReadCDS(pOld->aCdsEntry, &cds); bIsDir = ((cds.iExternalAttr>>16) & S_IFDIR) ? 1 : 0; diff --git a/manifest b/manifest index 5633e43082..296050499c 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Support\sUPDATE\sstatements\sagainst\szipfile\svirtual\stables. -D 2018-01-13T19:08:24.877 +C Fix\sharmless\scompiler\swarnings\sin\szipfile.c. +D 2018-01-13T23:28:33.571 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F Makefile.in 38f84f301cbef443b2d269f67a74b8cc536469831f70df7c3e912acc04932cc2 @@ -303,7 +303,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 fd05292abc98fb9ad84ffc24ac8f39a25472c992f81d3ea6f3379e0df36ef4a1 +F ext/misc/zipfile.c 7001d7ca733d34a8b4fbacf7f8d322f3b2bf402f41052a021b5eda8227f0f5d4 F ext/rbu/rbu.c ea7d1b7eb44c123a2a619332e19fe5313500705c4a58aaa1887905c0d83ffc2e F ext/rbu/rbu1.test 43836fac8c7179a358eaf38a8a1ef3d6e6285842 F ext/rbu/rbu10.test 1846519a438697f45e9dcb246908af81b551c29e1078d0304fae83f1fed7e9ee @@ -1699,7 +1699,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 bd70a07d819a54346cb6c40fab681424c5af0dfb6bf29321a3de9fc99d285376 -R 353db64d08ace436e64659cf45ce290c -U dan -Z 6cc524f643589f82fe6965a2f7fe8556 +P f2d2a5df4f29b47212fd2411eae6545087b901a270655640c87ceb472e02a24c +R 8e0eefc806344b75dcd41a32589e33e5 +U drh +Z 25a119edfc3f91c75d6d9bd6eb4524cb diff --git a/manifest.uuid b/manifest.uuid index f828d42ddb..0bd548e74c 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f2d2a5df4f29b47212fd2411eae6545087b901a270655640c87ceb472e02a24c \ No newline at end of file +8f7a592f8c044d75b4615a95e27454100b10c2b26f4cafee97dec23343821130 \ No newline at end of file