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

COMP: sprintf warnings. DWORD should use %ld rather than %d. Also, const char *p, a shadowed variable warning.

This commit is contained in:
Bill Lorensen 2008-05-10 22:48:53 -04:00
parent b837ade944
commit 68dfcefbcb
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/kwsys/ProcessWin32.c
View File

@ -379,7 +379,7 @@ kwsysProcess* kwsysProcess_New(void)
/* Construct the executable name from the process id and kwsysProcess /* Construct the executable name from the process id and kwsysProcess
instance. This should be unique. */ instance. This should be unique. */
sprintf(fwdName, KWSYS_NAMESPACE_STRING "pew9xfwd_%u_%p.exe", sprintf(fwdName, KWSYS_NAMESPACE_STRING "pew9xfwd_%ld_%p.exe",
GetCurrentProcessId(), cp); GetCurrentProcessId(), cp);
/* If we have a temp directory, use it. */ /* If we have a temp directory, use it. */

6
Source/kwsys/SystemInformation.cxx
View File

@ -2998,7 +2998,7 @@ bool SystemInformationImplementation::QueryOSInformation()
} }
} }
sprintf (operatingSystem, "%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); sprintf (operatingSystem, "%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem; this->OSVersion = operatingSystem;
} }
else else
@ -3047,7 +3047,7 @@ bool SystemInformationImplementation::QueryOSInformation()
if (osvi.dwMajorVersion <= 4) if (osvi.dwMajorVersion <= 4)
{ {
// NB: NT 4.0 and earlier. // NB: NT 4.0 and earlier.
sprintf (operatingSystem, "version %d.%d %s (Build %d)", sprintf (operatingSystem, "version %ld.%ld %s (Build %ld)",
osvi.dwMajorVersion, osvi.dwMajorVersion,
osvi.dwMinorVersion, osvi.dwMinorVersion,
osvi.szCSDVersion, osvi.szCSDVersion,
@ -3078,7 +3078,7 @@ bool SystemInformationImplementation::QueryOSInformation()
else else
{ {
// Windows 2000 and everything else. // Windows 2000 and everything else.
sprintf (operatingSystem,"%s(Build %d)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF); sprintf (operatingSystem,"%s(Build %ld)", osvi.szCSDVersion, osvi.dwBuildNumber & 0xFFFF);
this->OSVersion = operatingSystem; this->OSVersion = operatingSystem;
} }
break; break;

14
Source/kwsys/SystemTools.cxx
View File

@ -3125,9 +3125,9 @@ void SystemTools::SplitPath(const char* p,
if(root.size() == 1) if(root.size() == 1)
{ {
#if defined(_WIN32) && !defined(__CYGWIN__) #if defined(_WIN32) && !defined(__CYGWIN__)
if(const char* p = getenv("USERPROFILE")) if(const char* userp = getenv("USERPROFILE"))
{ {
homedir = p; homedir = userp;
} }
else else
#endif #endif
@ -4279,10 +4279,10 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
} }
res += " "; res += " ";
sprintf(buffer, "%d", osvi.dwMajorVersion); sprintf(buffer, "%ld", osvi.dwMajorVersion);
res += buffer; res += buffer;
res += "."; res += ".";
sprintf(buffer, "%d", osvi.dwMinorVersion); sprintf(buffer, "%ld", osvi.dwMinorVersion);
res += buffer; res += buffer;
} }
@ -4304,7 +4304,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
if (lRet == ERROR_SUCCESS) if (lRet == ERROR_SUCCESS)
{ {
res += " Service Pack 6a (Build "; res += " Service Pack 6a (Build ";
sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF); sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer; res += buffer;
res += ")"; res += ")";
} }
@ -4313,7 +4313,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
res += " "; res += " ";
res += osvi.szCSDVersion; res += osvi.szCSDVersion;
res += " (Build "; res += " (Build ";
sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF); sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer; res += buffer;
res += ")"; res += ")";
} }
@ -4325,7 +4325,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
res += " "; res += " ";
res += osvi.szCSDVersion; res += osvi.szCSDVersion;
res += " (Build "; res += " (Build ";
sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF); sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer; res += buffer;
res += ")"; res += ")";
} }