You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by an...@apache.org on 2016/10/02 16:29:38 UTC
[3/3] mesos git commit: Fixed usage of "can not" vs. "cannot" in
libprocess.
Fixed usage of "can not" vs. "cannot" in libprocess.
For style reasons, the latter should usually be preferred to the former.
Review: https://reviews.apache.org/r/51058/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/2e013890
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/2e013890
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/2e013890
Branch: refs/heads/master
Commit: 2e013890e47c30053b7b83cd205b432376589216
Parents: 891a69c
Author: Neil Conway <ne...@gmail.com>
Authored: Sun Oct 2 08:59:20 2016 -0700
Committer: Anand Mazumdar <an...@apache.org>
Committed: Sun Oct 2 08:59:20 2016 -0700
----------------------------------------------------------------------
3rdparty/libprocess/configure.ac | 2 +-
3rdparty/libprocess/include/process/io.hpp | 2 +-
3rdparty/libprocess/src/io.cpp | 2 +-
3rdparty/libprocess/src/tests/process_tests.cpp | 4 ++--
3rdparty/libprocess/src/tests/ssl_tests.cpp | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/2e013890/3rdparty/libprocess/configure.ac
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/configure.ac b/3rdparty/libprocess/configure.ac
index bc0e6ab..f3033e3 100644
--- a/3rdparty/libprocess/configure.ac
+++ b/3rdparty/libprocess/configure.ac
@@ -84,7 +84,7 @@ AC_ARG_ENABLE([debug],
AC_ARG_ENABLE([install],
AS_HELP_STRING([--enable-install],
[install libprocess]),
- [AC_MSG_ERROR([libprocess can not currently be installed])])
+ [AC_MSG_ERROR([libprocess cannot currently be installed])])
AC_ARG_ENABLE([libevent],
AS_HELP_STRING([--enable-libevent],
http://git-wip-us.apache.org/repos/asf/mesos/blob/2e013890/3rdparty/libprocess/include/process/io.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/io.hpp b/3rdparty/libprocess/include/process/io.hpp
index fed246b..eec5efd 100644
--- a/3rdparty/libprocess/include/process/io.hpp
+++ b/3rdparty/libprocess/include/process/io.hpp
@@ -166,7 +166,7 @@ Future<size_t> peek(int fd, void* data, size_t size, size_t limit);
* upper bound for the size of the data to peek. It does not wait
* until the specified amount of bytes is peeked. It returns as soon
* as some amount of data becomes available.
- * It can not concatenate data from subsequent peeks because MSG_PEEK
+ * It cannot concatenate data from subsequent peeks because MSG_PEEK
* has known limitations when it comes to spanning message boundaries.
*
* **NOTE**: this function will return an error if the limit is
http://git-wip-us.apache.org/repos/asf/mesos/blob/2e013890/3rdparty/libprocess/src/io.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/io.cpp b/3rdparty/libprocess/src/io.cpp
index e44ba3a..d930cee 100644
--- a/3rdparty/libprocess/src/io.cpp
+++ b/3rdparty/libprocess/src/io.cpp
@@ -598,7 +598,7 @@ Future<string> peek(int fd, size_t limit)
return io::peek(fd, data.get(), BUFFERED_READ_SIZE, limit)
.then([=](size_t length) -> Future<string> {
// At this point we have to return whatever data we were able to
- // peek, because we can not rely on peeking across message
+ // peek, because we cannot rely on peeking across message
// boundaries.
return string(data.get(), length);
});
http://git-wip-us.apache.org/repos/asf/mesos/blob/2e013890/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 b8c393f..3936f47 100644
--- a/3rdparty/libprocess/src/tests/process_tests.cpp
+++ b/3rdparty/libprocess/src/tests/process_tests.cpp
@@ -1605,7 +1605,7 @@ TEST(ProcessTest, Defers)
}
// {
-// // CAN NOT DO IN CLANG!
+// // CANNOT DO IN CLANG!
// std::function<void(string)> f =
// defer(std::bind(baz, std::placeholders::_1));
@@ -1617,7 +1617,7 @@ TEST(ProcessTest, Defers)
// }
// {
-// // CAN NOT DO WITH GCC OR CLANG!
+// // CANNOT DO WITH GCC OR CLANG!
// std::function<int(int)> f =
// defer(std::bind(baz, std::placeholders::_1));
// }
http://git-wip-us.apache.org/repos/asf/mesos/blob/2e013890/3rdparty/libprocess/src/tests/ssl_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/ssl_tests.cpp b/3rdparty/libprocess/src/tests/ssl_tests.cpp
index a5ac039..55c8c30 100644
--- a/3rdparty/libprocess/src/tests/ssl_tests.cpp
+++ b/3rdparty/libprocess/src/tests/ssl_tests.cpp
@@ -500,7 +500,7 @@ TEST_F(SSLTest, ValidDowngrade)
}
-// Ensure we can NOT communicate between a POLL based socket and an
+// Ensure we CANNOT communicate between a POLL based socket and an
// SSL socket if 'SSL_SUPPORT_DOWNGRADE' is not enabled.
TEST_F(SSLTest, NoValidDowngrade)
{
@@ -571,7 +571,7 @@ TEST_F(SSLTest, ValidDowngradeEachProtocol)
}
-// For each protocol: ensure we can NOT communicate between a POLL
+// For each protocol: ensure we CANNOT communicate between a POLL
// based socket and an SSL socket if 'SSL_SUPPORT_DOWNGRADE' is not
// enabled.
TEST_F(SSLTest, NoValidDowngradeEachProtocol)