2
0
Эх сурвалжийг харах

Merge pull request #1608 from turol/analyze

Re-enable Clang static analyzer
turol 7 жил өмнө
parent
commit
ed361f0b53

+ 1 - 1
.travis.sh

@@ -46,7 +46,7 @@ if [ "$TRAVIS_OS_NAME" = "linux" ]; then
   if [ $ANALYZE = "ON" ] ; then
   if [ $ANALYZE = "ON" ] ; then
     if [ "$CC" = "clang" ]; then
     if [ "$CC" = "clang" ]; then
         scan-build cmake -G "Unix Makefiles" -DBUILD_SHARED_LIBS=OFF -DASSIMP_BUILD_TESTS=OFF
         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
     else
         cppcheck --version
         cppcheck --version
         generate \
         generate \

+ 0 - 3
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;
         status = TINFL_STATUS_FAILED;
       else if (!(flags & MZ_ZIP_FLAG_COMPRESSED_DATA))
       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);
         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;
       out_buf_ofs += file_stat.m_comp_size;
-      comp_remaining = 0;
     }
     }
     else
     else
     {
     {
@@ -4685,7 +4683,6 @@ mz_bool mz_zip_writer_add_from_zip_reader(mz_zip_archive *pZip, mz_zip_archive *
       return MZ_FALSE;
       return MZ_FALSE;
     }
     }
 
 
-    cur_src_file_ofs += n;
     cur_dst_file_ofs += n;
     cur_dst_file_ofs += n;
   }
   }
   pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);
   pZip->m_pFree(pZip->m_pAlloc_opaque, pBuf);