diff options
| author | KWSys Robot <kwrobot@kitware.com> | 2013-05-29 12:55:14 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-05-29 12:56:13 (GMT) |
| commit | 927012979e54a69d9d49f188ce73f7b4ca2fb073 (patch) | |
| tree | 3d3891e823b8055010a3808a1f6c39046d992ad0 /SystemInformation.cxx | |
| parent | d0cdc687353cbba0ab844a360a23c71945c8370b (diff) | |
| download | CMake-927012979e54a69d9d49f188ce73f7b4ca2fb073.zip CMake-927012979e54a69d9d49f188ce73f7b4ca2fb073.tar.gz CMake-927012979e54a69d9d49f188ce73f7b4ca2fb073.tar.bz2 | |
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
Diffstat (limited to 'SystemInformation.cxx')
| -rw-r--r-- | SystemInformation.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |