[Cmake-commits] [cmake-commits] hoffman committed cmCTestTestHandler.cxx 1.74 1.75

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestTestHandler.cxx 
Log Message:
COMP: fix more warnings


Index: cmCTestTestHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestTestHandler.cxx,v
retrieving revision 1.74
retrieving revision 1.75
diff -C 2 -d -r1.74 -r1.75
*** cmCTestTestHandler.cxx	4 Jul 2008 13:55:26 -0000	1.74
--- cmCTestTestHandler.cxx	4 Jul 2008 14:10:30 -0000	1.75
***************
*** 1005,1013 ****
  {
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
    if(line == tag)
      {
      fin >> value;
!     cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
--- 1005,1014 ----
  {
    std::string line;
+   bool ret = true;
    cmSystemTools::GetLineFromStream(fin, line);
    if(line == tag)
      {
      fin >> value;
!     ret = cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
***************
*** 1016,1022 ****
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     return false;
      }
!   return true;
  }
  
--- 1017,1023 ----
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     ret = false;
      }
!   return ret;
  }
  
***************
*** 1027,1034 ****
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
    if(line == tag)
      {
      fin >> value;
!     cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
--- 1028,1036 ----
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
+   bool ret = true;
    if(line == tag)
      {
      fin >> value;
!     ret = cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
***************
*** 1037,1043 ****
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     return false;
      }
!   return true;
  }
  
--- 1039,1045 ----
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     ret = false;
      }
!   return ret;
  }
  
***************
*** 1048,1055 ****
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
    if(line == tag)
      {
      fin >> value;
!     cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
--- 1050,1058 ----
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
+   bool ret = true;
    if(line == tag)
      {
      fin >> value;
!     ret = cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
***************
*** 1058,1064 ****
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     return false;
      }
!   return true;
  }
  
--- 1061,1067 ----
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     ret = false;
      }
!   return ret;
  }
  
***************
*** 1069,1076 ****
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
    if(line == tag)
      {
      fin >> value;
!     cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
--- 1072,1080 ----
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
+   bool ret = true;
    if(line == tag)
      {
      fin >> value;
!     ret = cmSystemTools::GetLineFromStream(fin, line); // read blank line
      }
    else
***************
*** 1079,1085 ****
                 "parse error: missing tag: "
                 << tag << " found [" << line.c_str() << "]" << std::endl);
!     return false;
      }
!   return true;
  }
  
--- 1083,1089 ----
                 "parse error: missing tag: "
                 << tag << " found [" << line.c_str() << "]" << std::endl);
!     ret = false;
      }
!   return ret;
  }
  
***************
*** 1090,1096 ****
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
    if(line == tag)
      {
!     return cmSystemTools::GetLineFromStream(fin, value);
      }
    else
--- 1094,1101 ----
    std::string line;
    cmSystemTools::GetLineFromStream(fin, line);
+   bool ret = true;
    if(line == tag)
      {
!     ret =  cmSystemTools::GetLineFromStream(fin, value);
      }
    else
***************
*** 1099,1105 ****
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     return false;
      }
!   return true;
  }
  
--- 1104,1110 ----
                 "parse error: missing tag: "
                 << tag << " found [" << line << "]" << std::endl);
!     ret = false;
      }
!   return ret;
  }