Browse Source

COMP: Remove warnings

Andy Cedilnik 20 years ago
parent
commit
9a1098f52e
2 changed files with 1 additions and 7 deletions
  1. 0 5
      Source/CPack/cmCPackLog.cxx
  2. 1 2
      Source/CPack/cpack.cxx

+ 0 - 5
Source/CPack/cmCPackLog.cxx

@@ -82,9 +82,6 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_
   // By default no logging
   bool display = false;
 
-  // Should we go to the error stream
-  bool errorStream = false;
-
   // Display file and line number if debug
   bool useFileAndLine = m_Debug;
 
@@ -116,7 +113,6 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_
     {
     warning = true;
     display = true;
-    errorStream = true;
     if ( needTagString )
       {
       if ( tagString.size() > 0 ) { tagString += ","; }
@@ -127,7 +123,6 @@ void cmCPackLog::Log(int tag, const char* file, int line, const char* msg, size_
     {
     error = true;
     display = true;
-    errorStream = true;
     if ( needTagString )
       {
       if ( tagString.size() > 0 ) { tagString += ","; }

+ 1 - 2
Source/CPack/cpack.cxx

@@ -135,7 +135,6 @@ int main (int argc, char *argv[])
   log.SetOutputPrefix("CPack: ");
   log.SetVerbosePrefix("CPack Verbose: ");
 
-  int res = 0;
   cmSystemTools::EnableMSVCDebugHook();
 
   if ( cmSystemTools::GetCurrentWorkingDirectory().size() == 0 )
@@ -321,7 +320,7 @@ int main (int argc, char *argv[])
   cmCPack_Log(&log, cmCPackLog::LOG_VERBOSE, "Use generator: " << cpackGenerator->GetNameOfClass() << std::endl);
   cmCPack_Log(&log, cmCPackLog::LOG_VERBOSE, "For project: " << projName << std::endl);
 
-  res = cpackGenerator->ProcessGenerator();
+  int res = cpackGenerator->ProcessGenerator();
   if ( !res )
     {
     cmCPack_Log(&log, cmCPackLog::LOG_ERROR, "Error when generating package: " << cpackProjectName.c_str() << std::endl);