[cmake-commits] king committed cmCTestCoverageHandler.cxx 1.48 1.49 cmCTestSubmitHandler.cxx 1.27 1.28

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv14305/Source/CTest

Modified Files:
	cmCTestCoverageHandler.cxx cmCTestSubmitHandler.cxx 
Log Message:
COMP: Fix warnings on 64-bit Mac OS X build.  Patch from issue #3697.


Index: cmCTestCoverageHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCoverageHandler.cxx,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- cmCTestCoverageHandler.cxx	3 Aug 2007 20:44:04 -0000	1.48
+++ cmCTestCoverageHandler.cxx	5 Nov 2007 19:34:36 -0000	1.49
@@ -1501,15 +1501,15 @@
       float cper = percentBranch + percentFunction;
       if(totalBranches > 0)
         {
-        cper /= 2.0;
+        cper /= 2.0f;
         }
       percent_coverage += cper;
       float cmet = percentFunction + percentBranch;
       if(totalBranches > 0)
         {
-        cmet /= 2.0;
+        cmet /= 2.0f;
         }
-      cmet /= 100.0;
+      cmet /= 100.0f;
       // Hack for conversion of function to loc assume a function
       // has 100 lines of code
       functionsCalled *=100;

Index: cmCTestSubmitHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestSubmitHandler.cxx,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- cmCTestSubmitHandler.cxx	5 Dec 2006 14:14:32 -0000	1.27
+++ cmCTestSubmitHandler.cxx	5 Nov 2007 19:34:36 -0000	1.28
@@ -695,7 +695,15 @@
       return false;
       }
 
-    size_t fileSize = st.st_size;
+    // off_t can be bigger than size_t.  fread takes size_t.
+    // make sure the file is not too big.
+    if (st.st_size > (size_t)-1)
+      {
+      cmCTestLog(this->CTest, ERROR_MESSAGE, "  File too big: "
+        << local_file.c_str() << std::endl);
+      return false;
+      }
+    size_t fileSize = static_cast<size_t>(st.st_size);
     FILE* fp = fopen(local_file.c_str(), "rb");
     if ( !fp )
       {