This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 7f692b1ddb83ae7ab67d48a1718aeb3e033408b6 (commit)
via 2c0c59a2e182e25844ded2a551a79e58ab3b3c49 (commit)
via 927012979e54a69d9d49f188ce73f7b4ca2fb073 (commit)
via 6927b25affcb9e2e01fb226970fd91db143b5101 (commit)
from f1977e36c024b42c8f408e9ef2e2756a5410b6de (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7f692b1ddb83ae7ab67d48a1718aeb3e033408b6
commit 7f692b1ddb83ae7ab67d48a1718aeb3e033408b6
Merge: f1977e3 2c0c59a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed May 29 08:59:14 2013 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed May 29 08:59:14 2013 -0400
Merge topic 'update-kwsys' into next
2c0c59a Merge branch 'upstream-kwsys' into update-kwsys
9270129 KWSys 2013-05-29 (725e541e)
6927b25 CMake Nightly Date Stamp
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2c0c59a2e182e25844ded2a551a79e58ab3b3c49
commit 2c0c59a2e182e25844ded2a551a79e58ab3b3c49
Merge: 6927b25 9270129
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed May 29 08:56:20 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 29 08:56:20 2013 -0400
Merge branch 'upstream-kwsys' into update-kwsys
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=927012979e54a69d9d49f188ce73f7b4ca2fb073
commit 927012979e54a69d9d49f188ce73f7b4ca2fb073
Author: KWSys Robot <kwro...@kitware.com>
AuthorDate: Wed May 29 08:55:14 2013 -0400
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Wed May 29 08:56:13 2013 -0400
KWSys 2013-05-29 (725e541e)
Extract upstream KWSys using the following shell commands.
$ git archive --prefix=upstream-kwsys/ 725e541e | tar x
$ git shortlog --no-merges --abbrev=8 --format='%h %s' f4928d44..725e541e
Brad King (1):
9fd64779 SystemTools: Fix FileIsDirectory with long paths
Rolf Eike Beer (3):
e8269442 Tests: fix a warning with acc
87abd647 SystemInformation: fix truncation warnings
039d9598 fix warnings about sizeof() return value truncation
Change-Id: I1c459346a622610eac62dfcd3abd0e73c5a83494
diff --git a/SystemInformation.cxx b/SystemInformation.cxx
index 9e2a93d..9db1dee 100644
--- a/SystemInformation.cxx
+++ b/SystemInformation.cxx
@@ -1471,7 +1471,7 @@ int
SystemInformationImplementation::GetFullyQualifiedDomainName(
{
char host[NI_MAXHOST]={'\0'};
- int addrlen
+ socklen_t addrlen
= (fam==AF_INET?sizeof(struct sockaddr_in):sizeof(struct
sockaddr_in6));
ierr=getnameinfo(
@@ -3487,7 +3487,7 @@ bool SystemInformationImplementation::QueryLinuxMemory()
bool have[6] = { false, false, false, false, false, false };
unsigned long value[6];
int count = 0;
- while(fgets(buffer, sizeof(buffer), fd))
+ while(fgets(buffer, static_cast<int>(sizeof(buffer)), fd))
{
for(int i=0; i < 6; ++i)
{
diff --git a/SystemTools.cxx b/SystemTools.cxx
index 394d65e..158217e 100644
--- a/SystemTools.cxx
+++ b/SystemTools.cxx
@@ -2742,14 +2742,23 @@ bool SystemTools::FileIsDirectory(const char* name)
}
// Remove any trailing slash from the name except in a root component.
- char buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
+ char local_buffer[KWSYS_SYSTEMTOOLS_MAXPATH];
+ std::string string_buffer;
size_t last = length-1;
if(last > 0 && (name[last] == '/' || name[last] == '\\')
&& strcmp(name, "/") !=0 && name[last-1] != ':')
{
- memcpy(buffer, name, last);
- buffer[last] = 0;
- name = buffer;
+ if(last < sizeof(local_buffer))
+ {
+ memcpy(local_buffer, name, last);
+ local_buffer[last] = 0;
+ name = local_buffer;
+ }
+ else
+ {
+ string_buffer.append(name, last);
+ name = string_buffer.c_str();
+ }
}
// Now check the file node type.
diff --git a/testIOS.cxx b/testIOS.cxx
index 3b971e2..f0c7f1a 100644
--- a/testIOS.cxx
+++ b/testIOS.cxx
@@ -48,7 +48,7 @@ int testIOS(int, char*[])
return 1;
}
static const unsigned char array[] = {
0xff,0x4f,0xff,0x51,0x00,0x29,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x30,0x00,0x00,0x00,0x3e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x01,0x07,0x01,0x01,0xff,0x52,0x00,0x0c,0x00,0x00,0x00,0x01,0x00,0x05,0x04,0x04,0x00,0x01,0xff,0x5c,0x00,0x13,0x40,0x40,0x48,0x48,0x50,0x48,0x48,0x50,0x48,0x48,0x50,0x48,0x48,0x50,0x48,0x48,0x50,0xff,0x64,0x00,0x2c,0x00,0x00,0x43,0x72,0x65,0x61,0x74,0x65,0x64,0x20,0x62,0x79,0x20,0x49,0x54,0x4b,0x2f,0x47,0x44,0x43,0x4d,0x2f,0x4f,0x70,0x65,0x6e,0x4a,0x50,0x45,0x47,0x20,0x76,0x65,0x72,0x73,0x69,0x6f,0x6e,0x20,0x31,0x2e,0x30,0xff,0x90,0x00,0x0a,0x00,0x00,0x00,0x00,0x06,0x2c,0x00,0x01,0xff,0x93,0xcf,0xb0,0x18,0x08,0x7f,0xc6,0x99,0xbf,0xff,0xc0,0xf8,0xc1,0xc1,0xf3,0x05,0x81,0xf2,0x83,0x0a,0xa5,0xff,0x10,0x90,0xbf,0x2f,0xff,0x04,0xa8,0x7f,0xc0,0xf8,0xc4,0xc1,0xf3,0x09,0x81,0xf3,0x0c,0x19,0x34
};
- const unsigned int narray = sizeof(array); // 180
+ const size_t narray = sizeof(array); // 180
kwsys_ios::stringstream strstr;
strstr.write( (char*)array, narray );
//strstr.seekp( narray / 2 ); // set position of put pointer in mid string
diff --git a/testSystemInformation.cxx b/testSystemInformation.cxx
index 49a686c..738043f 100644
--- a/testSystemInformation.cxx
+++ b/testSystemInformation.cxx
@@ -88,9 +88,9 @@ int testSystemInformation(int, char*[])
printMethod3(info, GetHostMemoryUsed(), "KiB");
printMethod3(info, GetProcMemoryUsed(), "KiB");
- for (int i = 0; i <= 31; i++)
+ for (long int i = 0; i <= 31; i++)
{
- if (info.DoesCPUSupportFeature(1 << i))
+ if (info.DoesCPUSupportFeature(static_cast<long int>(1) << i))
{
kwsys_ios::cout << "CPU feature " << i << "\n";
}
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/kwsys/SystemInformation.cxx | 4 ++--
Source/kwsys/SystemTools.cxx | 17 +++++++++++++----
Source/kwsys/testIOS.cxx | 2 +-
Source/kwsys/testSystemInformation.cxx | 4 ++--
5 files changed, 19 insertions(+), 10 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
