[Cmake-commits] [cmake-commits] david.cole committed cmHexFileConverter.cxx 1.7 1.8 cmScriptGenerator.cxx 1.2 1.3 cmSystemTools.cxx 1.402 1.403 cmake.cxx 1.430 1.431 cmakewizard.cxx 1.24 1.25

[cmake-commits at cmake.org]

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

Modified Files:
	cmHexFileConverter.cxx cmScriptGenerator.cxx cmSystemTools.cxx 
	cmake.cxx cmakewizard.cxx 
Log Message:
Fix warnings in CMake source code. Suppress rampant warnings emanating from Qt files.


Index: cmScriptGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmScriptGenerator.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -C 2 -d -r1.2 -r1.3
*** cmScriptGenerator.cxx	28 Sep 2009 15:42:49 -0000	1.2
--- cmScriptGenerator.cxx	1 Oct 2009 20:47:08 -0000	1.3
***************
*** 54,58 ****
        {
        result += "[";
!       result += *c + ('A' - 'a');
        result += *c;
        result += "]";
--- 54,58 ----
        {
        result += "[";
!       result += static_cast<char>(*c + 'A' - 'a');
        result += *c;
        result += "]";
***************
*** 62,66 ****
        result += "[";
        result += *c;
!       result += *c + ('a' - 'A');
        result += "]";
        }
--- 62,66 ----
        result += "[";
        result += *c;
!       result += static_cast<char>(*c + 'a' - 'A');
        result += "]";
        }

Index: cmHexFileConverter.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmHexFileConverter.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** cmHexFileConverter.cxx	30 Sep 2009 15:42:40 -0000	1.7
--- cmHexFileConverter.cxx	1 Oct 2009 20:47:08 -0000	1.8
***************
*** 173,177 ****
      }
  
!   fgets(buf, 1024, inFile);
    fclose(inFile);
    FileType type = Binary;
--- 173,178 ----
      }
  
!   buf[0] = 0;
!   (void) fgets(buf, 1024, inFile);
    fclose(inFile);
    FileType type = Binary;

Index: cmakewizard.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmakewizard.cxx,v
retrieving revision 1.24
retrieving revision 1.25
diff -C 2 -d -r1.24 -r1.25
*** cmakewizard.cxx	28 Sep 2009 15:42:50 -0000	1.24
--- cmakewizard.cxx	1 Oct 2009 20:47:08 -0000	1.25
***************
*** 30,34 ****
    char buffer[4096];
    buffer[0] = 0;
!   fgets(buffer, sizeof(buffer)-1, stdin);
  
    if(strlen(buffer) > 0)
--- 30,34 ----
    char buffer[4096];
    buffer[0] = 0;
!   (void) fgets(buffer, sizeof(buffer)-1, stdin);
  
    if(strlen(buffer) > 0)
***************
*** 67,71 ****
    char buffer[4096];
    buffer[0] = 0;
!   fgets(buffer, sizeof(buffer)-1, stdin);
    if(buffer[0])
      {
--- 67,71 ----
    char buffer[4096];
    buffer[0] = 0;
!   (void) fgets(buffer, sizeof(buffer)-1, stdin);
    if(buffer[0])
      {

Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.402
retrieving revision 1.403
diff -C 2 -d -r1.402 -r1.403
*** cmSystemTools.cxx	28 Sep 2009 15:42:49 -0000	1.402
--- cmSystemTools.cxx	1 Oct 2009 20:47:08 -0000	1.403
***************
*** 339,343 ****
        c != v.end(); c++)
      {
!     *c = toupper(*c);
      }
    return (v == "ON" || v == "1" || v == "YES" || v == "TRUE" || v == "Y");
--- 339,343 ----
        c != v.end(); c++)
      {
!     *c = static_cast<char>(toupper(*c));
      }
    return (v == "ON" || v == "1" || v == "YES" || v == "TRUE" || v == "Y");
***************
*** 372,376 ****
        c != v.end(); c++)
      {
!     *c = toupper(*c);
      }
    return (v == "OFF" || v == "0" || v == "NO" || v == "FALSE" || 
--- 372,376 ----
        c != v.end(); c++)
      {
!     *c = static_cast<char>(toupper(*c));
      }
    return (v == "OFF" || v == "0" || v == "NO" || v == "FALSE" || 
***************
*** 916,920 ****
      return false;
      }
!   fgets(buffer, BUFFER_SIZE, cpipe);
    while(!feof(cpipe))
      {
--- 916,921 ----
      return false;
      }
!   buffer[0] = 0;
!   (void) fgets(buffer, BUFFER_SIZE, cpipe);
    while(!feof(cpipe))
      {
***************
*** 925,929 ****
      output += buffer;
      buffer[0] = 0;
!     fgets(buffer, BUFFER_SIZE, cpipe);
      }
  
--- 926,930 ----
      output += buffer;
      buffer[0] = 0;
!     (void) fgets(buffer, BUFFER_SIZE, cpipe);
      }
  

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.430
retrieving revision 1.431
diff -C 2 -d -r1.430 -r1.431
*** cmake.cxx	28 Sep 2009 15:42:50 -0000	1.430
--- cmake.cxx	1 Oct 2009 20:47:08 -0000	1.431
***************
*** 1277,1281 ****
        if (countFile)
          {
!         fscanf(countFile,"%i",&count);
          fclose(countFile);
          }
--- 1277,1284 ----
        if (countFile)
          {
!         if (1!=fscanf(countFile,"%i",&count))
!           {
!           cmSystemTools::Message("Could not read from count file.");
!           }
          fclose(countFile);
          }
***************
*** 1319,1323 ****
        else
          {
!         fscanf(progFile,"%i",&count);
          fclose(progFile);
          }
--- 1322,1329 ----
        else
          {
!         if (1!=fscanf(progFile,"%i",&count))
!           {
!           cmSystemTools::Message("Could not read from progress file.");
!           }
          fclose(progFile);
          }