Repository: mesos Updated Branches: refs/heads/master dd960dfcb -> b0beb5b4a
Fixed style issues in abort.hpp. Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/b0beb5b4 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/b0beb5b4 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/b0beb5b4 Branch: refs/heads/master Commit: b0beb5b4ac657977393c9f0224a8e50147fc88df Parents: dd960df Author: Benjamin Hindman <[email protected]> Authored: Fri Jun 26 17:32:50 2015 -0700 Committer: Benjamin Hindman <[email protected]> Committed: Fri Jun 26 17:32:50 2015 -0700 ---------------------------------------------------------------------- .../3rdparty/stout/include/stout/abort.hpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/b0beb5b4/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp index 6a6f05b..3aa9487 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp @@ -30,8 +30,8 @@ #define ABORT(...) _Abort(_ABORT_PREFIX, __VA_ARGS__) inline __attribute__((noreturn)) void _Abort( - const char *prefix, - const char *msg) + const char* prefix, + const char* message) { // Write the failure message in an async-signal safe manner, // assuming strlen is async-signal safe or optimized out. @@ -40,16 +40,17 @@ inline __attribute__((noreturn)) void _Abort( // http://austingroupbugs.net/view.php?id=692 while (write(STDERR_FILENO, prefix, strlen(prefix)) == -1 && errno == EINTR); - while (msg != NULL && - write(STDERR_FILENO, msg, strlen(msg)) == -1 && + while (message != NULL && + write(STDERR_FILENO, message, strlen(message)) == -1 && errno == EINTR); abort(); } + inline __attribute__((noreturn)) void _Abort( - const char *prefix, - const std::string &msg) { - _Abort(prefix, msg.c_str()); + const char* prefix, + const std::string& message) { + _Abort(prefix, message.c_str()); } #endif // __STOUT_ABORT_HPP__
