From dcd622a5e1cc8ba82a5f1d805a654b7c3ad8bdcd Mon Sep 17 00:00:00 2001
From: Bill Lorensen <lorensen@crd.ge.com>
Date: Sat, 10 May 2008 22:48:53 -0400
Subject: [PATCH] COMP: sprintf warnings. DWORD should use %ld rather than %d.
Also, const char *p, a shadowed variable warning.
---
ProcessWin32.c | 2 +-
SystemInformation.cxx | 6 +++---
SystemTools.cxx | 14 +++++++-------
kwsysDateStamp.cmake | 2 +-
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/ProcessWin32.c b/ProcessWin32.c
index 1dafabe..0e30dc1 100644
--- a/ProcessWin32.c
+++ b/ProcessWin32.c
@@ -379,7 +379,7 @@ kwsysProcess* kwsysProcess_New(void)
/* Construct the executable name from the process id and kwsysProcess
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);
/* If we have a temp directory, use it. */
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 35b487f..19cb80d 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -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;
}
else
@@ -3047,7 +3047,7 @@ bool SystemInformationImplementation::QueryOSInformation()
if (osvi.dwMajorVersion <= 4)
{
// 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.dwMinorVersion,
osvi.szCSDVersion,
@@ -3078,7 +3078,7 @@ bool SystemInformationImplementation::QueryOSInformation()
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;
}
break;
diff --git a/SystemTools.cxx b/SystemTools.cxx
index f72f5d0..11d2336 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -3125,9 +3125,9 @@ void SystemTools::SplitPath(const char* p,
if(root.size() == 1)
{
#if defined(_WIN32) && !defined(__CYGWIN__)
- if(const char* p = getenv("USERPROFILE"))
+ if(const char* userp = getenv("USERPROFILE"))
{
- homedir = p;
+ homedir = userp;
}
else
#endif
@@ -4279,10 +4279,10 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
}
res += " ";
- sprintf(buffer, "%d", osvi.dwMajorVersion);
+ sprintf(buffer, "%ld", osvi.dwMajorVersion);
res += buffer;
res += ".";
- sprintf(buffer, "%d", osvi.dwMinorVersion);
+ sprintf(buffer, "%ld", osvi.dwMinorVersion);
res += buffer;
}
@@ -4304,7 +4304,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
if (lRet == ERROR_SUCCESS)
{
res += " Service Pack 6a (Build ";
- sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF);
+ sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
}
@@ -4313,7 +4313,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
res += " ";
res += osvi.szCSDVersion;
res += " (Build ";
- sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF);
+ sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
}
@@ -4325,7 +4325,7 @@ kwsys_stl::string SystemTools::GetOperatingSystemNameAndVersion()
res += " ";
res += osvi.szCSDVersion;
res += " (Build ";
- sprintf(buffer, "%d", osvi.dwBuildNumber & 0xFFFF);
+ sprintf(buffer, "%ld", osvi.dwBuildNumber & 0xFFFF);
res += buffer;
res += ")";
}
diff --git a/kwsysDateStamp.cmake b/kwsysDateStamp.cmake
index 60dbef1..50fce07 100644
--- a/kwsysDateStamp.cmake
+++ b/kwsysDateStamp.cmake
@@ -7,4 +7,4 @@ SET(KWSYS_DATE_STAMP_YEAR 2008)
SET(KWSYS_DATE_STAMP_MONTH 05)
# KWSys version date day component. Format is DD.
-SET(KWSYS_DATE_STAMP_DAY 02)
+SET(KWSYS_DATE_STAMP_DAY 10)
--
GitLab