kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix leaks and turn on by default

This commit is contained in:
Bill Hoffman 2008-01-08 14:59:57 -05:00
parent 66fff9d4b7
commit 50c5d5a3d5
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/kwsys/CMakeLists.txt
View File

@ -137,7 +137,7 @@ IF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
SET(KWSYS_USE_IOStream 1)
SET(KWSYS_USE_DateStamp 1)
SET(KWSYS_USE_String 1)
# SET(KWSYS_USE_SystemInformation 1)
SET(KWSYS_USE_SystemInformation 1)
ENDIF(KWSYS_STANDALONE OR CMake_SOURCE_DIR)
# Setup the large file support default.

38
Source/kwsys/SystemInformation.cxx
View File

@ -17,6 +17,7 @@
#include KWSYS_HEADER(SystemInformation.hxx)
#include KWSYS_HEADER(Process.h)
#include KWSYS_HEADER(ios/iostream)
#include KWSYS_HEADER(ios/sstream)
#ifndef WIN32
#include <sys/utsname.h> // int uname(struct utsname *buf);
#endif
@ -171,35 +172,35 @@ const char * SystemInformation::GetVendorID()
}
/** Return the type ID of the CPU */
const char * SystemInformation::GetTypeID()
kwsys_stl::string SystemInformation::GetTypeID()
{
char * temp = new char[32];
sprintf(temp,"%d",this->ChipID.Type);
return temp;
kwsys_ios::ostringstream str;
str << this->ChipID.Type;
return str.str();
}
/** Return the family of the CPU present */
const char * SystemInformation::GetFamilyID()
kwsys_stl::string SystemInformation::GetFamilyID()
{
char * temp = new char[32];
sprintf(temp,"%d",this->ChipID.Family);
return temp;
kwsys_ios::ostringstream str;
str << this->ChipID.Family;
return str.str();
}
// Return the model of CPU present */
const char * SystemInformation::GetModelID()
kwsys_stl::string SystemInformation::GetModelID()
{
char * temp = new char[32];
sprintf(temp,"%d",this->ChipID.Model);
return temp;
kwsys_ios::ostringstream str;
str << this->ChipID.Model;
return str.str();
}
/** Return the stepping code of the CPU present. */
const char * SystemInformation::GetSteppingCode()
{
char * temp = new char[32];
sprintf(temp,"%d",this->ChipID.Revision);
return temp;
kwsys_stl::string SystemInformation::GetSteppingCode()
{
kwsys_ios::ostringstream str;
str << this->ChipID.Revision;
return str.str();
}
/** Return the stepping code of the CPU present. */
@ -2649,7 +2650,8 @@ bool SystemInformation::QueryOSInformation()
this->OSRelease = "Unknown";
break;
}
delete [] operatingSystem;
operatingSystem = 0;
// Get the hostname
WORD wVersionRequested;

8
Source/kwsys/SystemInformation.hxx.in
View File

@ -113,10 +113,10 @@ public:
const char * GetVendorString();
const char * GetVendorID();
const char * GetTypeID();
const char * GetFamilyID();
const char * GetModelID();
const char * GetSteppingCode();
kwsys_stl::string GetTypeID();
kwsys_stl::string GetFamilyID();
kwsys_stl::string GetModelID();
kwsys_stl::string GetSteppingCode();
const char * GetExtendedProcessorName();
const char * GetProcessorSerialNumber();
int GetProcessorCacheSize();