From 26f749fcd28c43e2d6df83c8ef65d18fa6e702de Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Sat, 2 Dec 2017 17:58:33 +0200 Subject: [PATCH 1/2] Re-enable Clang static analysis --- .travis.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.sh b/.travis.sh index 397e75077..fb42bd40d 100755 --- a/.travis.sh +++ b/.travis.sh @@ -46,7 +46,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then if [ $ANALYZE = "ON" ] ; then if [ "$CC" = "clang" ]; then scan-build cmake -G "Unix Makefiles" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_TESTS=OFF - scan-build --status-bugs make -j2 -v + scan-build --status-bugs make -j2 else cppcheck --version generate \ From 45f2f31011918dea3e558729c8ea5f88c1a214d3 Mon Sep 17 00:00:00 2001 From: Turo Lamminen Date: Sat, 2 Dec 2017 17:59:04 +0200 Subject: [PATCH 2/2] miniz: Remove some dead assignments --- contrib/zip/src/miniz.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/zip/src/miniz.h b/contrib/zip/src/miniz.h index 56c7e8184..841e9e128 100644 --- a/contrib/zip/src/miniz.h +++ b/contrib/zip/src/miniz.h @@ -3804,9 +3804,7 @@ mz_bool mz_zip_reader_extract_to_callback(mz_zip_archive *pZip, mz_uint file_ind status = TINFL_STATUS_FAILED; else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA)) file_crc32 = (mz_uint32)mz_crc32(file_crc32, (const mz_uint8 *)pRead_buf, (size_t)file_stat.m_comp_size); - cur_file_ofs += file_stat.m_comp_size; out_buf_ofs += file_stat.m_comp_size; - comp_remaining = 0; } else { @@ -4685,7 +4683,6 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive * return MZ_FALSE; } - cur_src_file_ofs += n; cur_dst_file_ofs += n; } pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);