You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dm...@apache.org on 2014/12/13 00:41:23 UTC
[2/5] mesos git commit: Fixed coding style issues related to the
variable naming convention in libprocess
Fixed coding style issues related to the variable naming convention in libprocess
Review: https://reviews.apache.org/r/28956
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/bd71c1fb
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/bd71c1fb
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/bd71c1fb
Branch: refs/heads/master
Commit: bd71c1fb3d291082974e66e667b1eb37f637bfb3
Parents: 6e2c889
Author: Evelina Dumitrescu <ev...@gmail.com>
Authored: Fri Dec 12 15:28:03 2014 -0800
Committer: Dominic Hamon <dh...@twitter.com>
Committed: Fri Dec 12 15:28:27 2014 -0800
----------------------------------------------------------------------
3rdparty/libprocess/include/process/socket.hpp | 12 ++++++------
3rdparty/libprocess/src/http.cpp | 6 +++---
3rdparty/libprocess/src/process.cpp | 12 ++++++------
3rdparty/libprocess/src/tests/http_tests.cpp | 6 +++---
3rdparty/libprocess/src/tests/process_tests.cpp | 12 ++++++------
5 files changed, 24 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/bd71c1fb/3rdparty/libprocess/include/process/socket.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/socket.hpp b/3rdparty/libprocess/include/process/socket.hpp
index 91f9084..9f6c847 100644
--- a/3rdparty/libprocess/include/process/socket.hpp
+++ b/3rdparty/libprocess/include/process/socket.hpp
@@ -62,24 +62,24 @@ inline Try<int> bind(int s, const Node& node)
{
sockaddr_in addr = net::createSockaddrIn(node.ip, node.port);
- int bound = ::bind(s, (sockaddr*) &addr, sizeof(addr));
- if (bound < 0) {
+ int error = ::bind(s, (sockaddr*) &addr, sizeof(addr));
+ if (error < 0) {
return ErrnoError("Failed to bind on " + stringify(node));
}
- return bound;
+ return error;
}
inline Try<int> connect(int s, const Node& node)
{
sockaddr_in addr = net::createSockaddrIn(node.ip, node.port);
- int connected = ::connect(s, (sockaddr*) &addr, sizeof(addr));
- if (connected < 0) {
+ int error = ::connect(s, (sockaddr*) &addr, sizeof(addr));
+ if (error < 0) {
return ErrnoError("Failed to connect to " + stringify(node));
}
- return connected;
+ return error;
}
inline Try<Node> getsockname(int s, sa_family_t family)
http://git-wip-us.apache.org/repos/asf/mesos/blob/bd71c1fb/3rdparty/libprocess/src/http.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp
index 465e447..54f0e5d 100644
--- a/3rdparty/libprocess/src/http.cpp
+++ b/3rdparty/libprocess/src/http.cpp
@@ -82,10 +82,10 @@ Future<Response> request(
const string host = stringify(upid.node);
- Try<int> connected = process::connect(s, upid.node);
- if (connected.isError()) {
+ Try<int> connect = process::connect(s, upid.node);
+ if (connect.isError()) {
os::close(s);
- return Failure(connected.error());
+ return Failure(connect.error());
}
std::ostringstream out;
http://git-wip-us.apache.org/repos/asf/mesos/blob/bd71c1fb/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index 688aebd..d4d823d 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -1281,14 +1281,14 @@ Future<Nothing> connect(const Socket& socket)
Future<Nothing> Socket::Impl::connect(const Node& node)
{
- Try<int> connected = process::connect(get(), node);
- if (connected.isError()) {
+ Try<int> connect = process::connect(get(), node);
+ if (connect.isError()) {
if (errno == EINPROGRESS) {
return io::poll(get(), io::WRITE)
.then(lambda::bind(&internal::connect, Socket(shared_from_this())));
}
- return Failure(connected.error());
+ return Failure(connect.error());
}
return Nothing();
@@ -1393,9 +1393,9 @@ Future<size_t> Socket::Impl::sendfile(int fd, off_t offset, size_t size)
Try<Node> Socket::Impl::bind(const Node& node)
{
- Try<int> bound = process::bind(get(), node);
- if (bound.isError()) {
- return Error(bound.error());
+ Try<int> bind = process::bind(get(), node);
+ if (bind.isError()) {
+ return Error(bind.error());
}
// Lookup and store assigned ip and assigned port.
http://git-wip-us.apache.org/repos/asf/mesos/blob/bd71c1fb/3rdparty/libprocess/src/tests/http_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/http_tests.cpp b/3rdparty/libprocess/src/tests/http_tests.cpp
index 3bda76d..ac7913c 100644
--- a/3rdparty/libprocess/src/tests/http_tests.cpp
+++ b/3rdparty/libprocess/src/tests/http_tests.cpp
@@ -114,11 +114,11 @@ TEST(HTTP, Endpoints)
spawn(process);
// First hit '/body' (using explicit sockets and HTTP/1.0).
- Try<int> sock = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ Try<int> socket = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
- ASSERT_TRUE(sock.isSome());
+ ASSERT_TRUE(socket.isSome());
- int s = sock.get();
+ int s = socket.get();
ASSERT_TRUE(process::connect(s, process.self().node).isSome());
http://git-wip-us.apache.org/repos/asf/mesos/blob/bd71c1fb/3rdparty/libprocess/src/tests/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/process_tests.cpp b/3rdparty/libprocess/src/tests/process_tests.cpp
index 45be2e1..d0a3945 100644
--- a/3rdparty/libprocess/src/tests/process_tests.cpp
+++ b/3rdparty/libprocess/src/tests/process_tests.cpp
@@ -1419,11 +1419,11 @@ TEST(Process, remote)
EXPECT_CALL(process, handler(_, _))
.WillOnce(FutureSatisfy(&handler));
- Try<int> sock = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ Try<int> socket = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
- ASSERT_TRUE(sock.isSome());
+ ASSERT_TRUE(socket.isSome());
- int s = sock.get();
+ int s = socket.get();
ASSERT_TRUE(process::connect(s, process.self().node).isSome());
@@ -1485,10 +1485,10 @@ TEST(Process, http2)
spawn(process);
// Create a receiving socket so we can get messages back.
- Try<int> sock = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
- ASSERT_TRUE(sock.isSome());
+ Try<int> socket = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ ASSERT_TRUE(socket.isSome());
- int s = sock.get();
+ int s = socket.get();
ASSERT_TRUE(process::bind(s, Node()).isSome());