Repository: mesos Updated Branches: refs/heads/master a6cae9f14 -> c3bd1a056
stout: Fixed style issues around control structures. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/99957d8e Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/99957d8e Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/99957d8e Branch: refs/heads/master Commit: 99957d8eeb0f5c6660b7e0171ca32c911ce617df Parents: a6cae9f Author: Michael Park <[email protected]> Authored: Thu Aug 27 22:17:41 2015 -0400 Committer: Michael Park <[email protected]> Committed: Thu Aug 27 22:17:41 2015 -0400 ---------------------------------------------------------------------- .../libprocess/3rdparty/stout/include/stout/os/posix/read.hpp | 3 +-- 3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp | 6 ++---- 3rdparty/libprocess/3rdparty/stout/tests/ip_tests.cpp | 2 +- 3rdparty/libprocess/3rdparty/stout/tests/mac_tests.cpp | 2 +- 4 files changed, 5 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/99957d8e/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/read.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/read.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/read.hpp index abde7a4..e154bb6 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/read.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/posix/read.hpp @@ -75,8 +75,7 @@ inline Result<std::string> read(int fd, size_t size) inline Try<std::string> read(const std::string& path) { std::ifstream ifs(path.c_str()); - if (!ifs.is_open()) - { + if (!ifs.is_open()) { return ErrnoError("Failed to open file '" + path + "'"); } return std::string((std::istreambuf_iterator<char>(ifs)), http://git-wip-us.apache.org/repos/asf/mesos/blob/99957d8e/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp index dfb2d94..6ed0da2 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp @@ -48,8 +48,7 @@ inline Result<Process> process(pid_t pid) return ErrnoError("Cannot open " + fn); } - if (::read(fd.get(), &pstatus, sizeof(pstatus)) != sizeof(pstatus)) - { + if (::read(fd.get(), &pstatus, sizeof(pstatus)) != sizeof(pstatus)) { os::close(fd.get()); return Error("Cannot read from " + fn); } @@ -63,8 +62,7 @@ inline Result<Process> process(pid_t pid) return ErrnoError("Cannot open " + fn); } - if (::read(fd.get(), &psinfo, sizeof(psinfo)) != sizeof(psinfo)) - { + if (::read(fd.get(), &psinfo, sizeof(psinfo)) != sizeof(psinfo)) { os::close(fd.get()); return Error("Cannot read from " + fn); } http://git-wip-us.apache.org/repos/asf/mesos/blob/99957d8e/3rdparty/libprocess/3rdparty/stout/tests/ip_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/ip_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/ip_tests.cpp index 532d064..b0cbcb3 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/ip_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/ip_tests.cpp @@ -38,7 +38,7 @@ TEST(NetTest, LinkDevice) Try<set<string> > links = net::links(); ASSERT_SOME(links); - foreach(const string& link, links.get()) { + foreach (const string& link, links.get()) { Result<net::IPNetwork> network = net::IPNetwork::fromLinkDevice(link, AF_INET); http://git-wip-us.apache.org/repos/asf/mesos/blob/99957d8e/3rdparty/libprocess/3rdparty/stout/tests/mac_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/mac_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/mac_tests.cpp index 0d39806..120f120 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/mac_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/mac_tests.cpp @@ -37,7 +37,7 @@ TEST(NetTest, Mac) Try<set<string> > links = net::links(); ASSERT_SOME(links); - foreach(const string& link, links.get()) { + foreach (const string& link, links.get()) { Result<net::MAC> mac = net::mac(link); EXPECT_FALSE(mac.isError());
