[Cmake-commits] [cmake-commits] hoffman committed ProcessUNIX.c 1.71.2.4 1.71.2.5 System.c 1.11.2.1 1.11.2.2 SystemInformation.cxx 1.22.2.5 1.22.2.6

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	ProcessUNIX.c System.c SystemInformation.cxx 
Log Message:
ENH: merge fixes for RC 6


Index: ProcessUNIX.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/ProcessUNIX.c,v
retrieving revision 1.71.2.4
retrieving revision 1.71.2.5
diff -C 2 -d -r1.71.2.4 -r1.71.2.5
*** ProcessUNIX.c	24 Oct 2008 15:18:55 -0000	1.71.2.4
--- ProcessUNIX.c	31 Dec 2008 15:14:30 -0000	1.71.2.5
***************
*** 724,728 ****
      {
      int r;
!     if(!getcwd(cp->RealWorkingDirectory, cp->RealWorkingDirectoryLength))
        {
        kwsysProcessCleanup(cp, 1);
--- 724,729 ----
      {
      int r;
!     if(!getcwd(cp->RealWorkingDirectory,
!                (size_t)(cp->RealWorkingDirectoryLength)))
        {
        kwsysProcessCleanup(cp, 1);

Index: SystemInformation.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/SystemInformation.cxx,v
retrieving revision 1.22.2.5
retrieving revision 1.22.2.6
diff -C 2 -d -r1.22.2.5 -r1.22.2.6
*** SystemInformation.cxx	24 Oct 2008 15:18:55 -0000	1.22.2.5
--- SystemInformation.cxx	31 Dec 2008 15:14:33 -0000	1.22.2.6
***************
*** 2159,2163 ****
    while(!feof(fd))
      {
!     buffer += fgetc(fd);
      fileSize++;
      }
--- 2159,2163 ----
    while(!feof(fd))
      {
!     buffer += static_cast<unsigned char>(fgetc(fd));
      fileSize++;
      }
***************
*** 2501,2505 ****
    if (!this->IsHyperThreadingSupported()) 
      {
!     return (unsigned char) 1;  // HT not supported
      }
    __asm
--- 2501,2505 ----
    if (!this->IsHyperThreadingSupported()) 
      {
!     return static_cast<unsigned char>(1);  // HT not supported
      }
    __asm
***************
*** 2510,2514 ****
      }
  #endif
!   return (unsigned char) ((Regebx & NUM_LOGICAL_BITS) >> 16);
  }
  
--- 2510,2514 ----
      }
  #endif
!   return static_cast<unsigned char> ((Regebx & NUM_LOGICAL_BITS) >> 16);
  }
  
***************
*** 2566,2570 ****
    if (!this->IsHyperThreadingSupported()) 
      {
!     return (unsigned char) -1;  // HT not supported
      } // Logical processor = 1
    __asm
--- 2566,2570 ----
    if (!this->IsHyperThreadingSupported()) 
      {
!     return static_cast<unsigned char>(-1);  // HT not supported
      } // Logical processor = 1
    __asm
***************
*** 2575,2579 ****
      }
  #endif
!   return (unsigned char) ((Regebx & INITIAL_APIC_ID_BITS) >> 24);
  }
  
--- 2575,2579 ----
      }
  #endif
!   return static_cast<unsigned char>((Regebx & INITIAL_APIC_ID_BITS) >> 24);
  }
  
***************
*** 2728,2732 ****
      }
  
!   this->CPUSpeedInMHz = atoi(this->ExtractValueFromSysCtl("hw.cpufrequency:").c_str()); 
    this->CPUSpeedInMHz /= 1000000;
  
--- 2728,2732 ----
      }
  
!   this->CPUSpeedInMHz = static_cast<float>(atoi(this->ExtractValueFromSysCtl("hw.cpufrequency:").c_str())); 
    this->CPUSpeedInMHz /= 1000000;
  
***************
*** 2898,2902 ****
  {
    // Parse values
!   this->NumberOfPhysicalCPU = atoi(this->ParseValueFromKStat("-n systethis->misc -s ncpus").c_str());
    this->NumberOfLogicalCPU = this->NumberOfPhysicalCPU;
    
--- 2898,2902 ----
  {
    // Parse values
!   this->NumberOfPhysicalCPU = atoi(this->ParseValueFromKStat("-n syste_misc -s ncpus").c_str());
    this->NumberOfLogicalCPU = this->NumberOfPhysicalCPU;
    
***************
*** 2906,2910 ****
      }
  
!   this->CPUSpeedInMHz = atoi(this->ParseValueFromKStat("-s clock_MHz").c_str());
  
    // Chip family
--- 2906,2910 ----
      }
  
!   this->CPUSpeedInMHz = static_cast<float>(atoi(this->ParseValueFromKStat("-s clock_MHz").c_str()));
  
    // Chip family

Index: System.c
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/kwsys/System.c,v
retrieving revision 1.11.2.1
retrieving revision 1.11.2.2
diff -C 2 -d -r1.11.2.1 -r1.11.2.2
*** System.c	1 May 2008 16:35:40 -0000	1.11.2.1
--- System.c	31 Dec 2008 15:14:32 -0000	1.11.2.2
***************
*** 171,174 ****
--- 171,180 ----
                                                    int flags)
  {
+   /* The empty string needs quotes.  */
+   if(!*in)
+     {
+     return 1;
+     }
+ 
    /* Scan the string for characters that require quoting.  */
    {