Mojo: Change "handle_[01]" -> "handle[01]".

In accordance with popular opinion.

R=sky@chromium.org

Review URL: https://codereview.chromium.org/133453003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@245552 0039d316-1c4b-4281-b951-d872f2087c98
parent 77a7c431
...@@ -22,14 +22,14 @@ namespace js { ...@@ -22,14 +22,14 @@ namespace js {
namespace { namespace {
gin::Dictionary CreateMessagePipe(const gin::Arguments& args) { gin::Dictionary CreateMessagePipe(const gin::Arguments& args) {
MojoHandle handle_0 = MOJO_HANDLE_INVALID; MojoHandle handle0 = MOJO_HANDLE_INVALID;
MojoHandle handle_1 = MOJO_HANDLE_INVALID; MojoHandle handle1 = MOJO_HANDLE_INVALID;
MojoResult result = MojoCreateMessagePipe(&handle_0, &handle_1); MojoResult result = MojoCreateMessagePipe(&handle0, &handle1);
CHECK(result == MOJO_RESULT_OK); CHECK(result == MOJO_RESULT_OK);
gin::Dictionary dictionary = gin::Dictionary::CreateEmpty(args.isolate()); gin::Dictionary dictionary = gin::Dictionary::CreateEmpty(args.isolate());
dictionary.Set("handle0", handle_0); dictionary.Set("handle0", handle0);
dictionary.Set("handle1", handle_1); dictionary.Set("handle1", handle1);
return dictionary; return dictionary;
} }
......
...@@ -348,20 +348,20 @@ MOJO_SYSTEM_EXPORT MojoResult MojoWaitMany(const MojoHandle* handles, ...@@ -348,20 +348,20 @@ MOJO_SYSTEM_EXPORT MojoResult MojoWaitMany(const MojoHandle* handles,
// Creates a message pipe, which is a bidirectional communication channel for // Creates a message pipe, which is a bidirectional communication channel for
// framed data (i.e., messages). Messages can contain plain data and/or Mojo // framed data (i.e., messages). Messages can contain plain data and/or Mojo
// handles. On success, |*message_pipe_handle_0| and |*message_pipe_1| are set // handles. On success, |*message_pipe_handle0| and |*message_pipe_handle1| are
// to handles for the two endpoints (ports) for the message pipe. // set to handles for the two endpoints (ports) for the message pipe.
// //
// Returns: // Returns:
// |MOJO_RESULT_OK| on success. // |MOJO_RESULT_OK| on success.
// |MOJO_RESULT_INVALID_ARGUMENT| if |message_pipe_handle_0| and/or // |MOJO_RESULT_INVALID_ARGUMENT| if |message_pipe_handle0| and/or
// |message_pipe_handle_1| do not appear to be valid pointers. // |message_pipe_handle1| do not appear to be valid pointers.
// |MOJO_RESULT_RESOURCE_EXHAUSTED| if a process/system/quota/etc. limit has // |MOJO_RESULT_RESOURCE_EXHAUSTED| if a process/system/quota/etc. limit has
// been reached. // been reached.
// //
// TODO(vtl): Add an options struct pointer argument. // TODO(vtl): Add an options struct pointer argument.
MOJO_SYSTEM_EXPORT MojoResult MojoCreateMessagePipe( MOJO_SYSTEM_EXPORT MojoResult MojoCreateMessagePipe(
MojoHandle* message_pipe_handle_0, MojoHandle* message_pipe_handle0,
MojoHandle* message_pipe_handle_1); MojoHandle* message_pipe_handle1);
// Writes a message to the message pipe endpoint given by |message_pipe_handle|, // Writes a message to the message pipe endpoint given by |message_pipe_handle|,
// with message data specified by |bytes| of size |num_bytes| and attached // with message data specified by |bytes| of size |num_bytes| and attached
......
...@@ -36,11 +36,10 @@ MojoResult MojoWaitMany(const MojoHandle* handles, ...@@ -36,11 +36,10 @@ MojoResult MojoWaitMany(const MojoHandle* handles,
return g_core->WaitMany(handles, flags, num_handles, deadline); return g_core->WaitMany(handles, flags, num_handles, deadline);
} }
MojoResult MojoCreateMessagePipe(MojoHandle* message_pipe_handle_0, MojoResult MojoCreateMessagePipe(MojoHandle* message_pipe_handle0,
MojoHandle* message_pipe_handle_1) { MojoHandle* message_pipe_handle1) {
assert(g_core); assert(g_core);
return g_core->CreateMessagePipe(message_pipe_handle_0, return g_core->CreateMessagePipe(message_pipe_handle0, message_pipe_handle1);
message_pipe_handle_1);
} }
MojoResult MojoWriteMessage(MojoHandle message_pipe_handle, MojoResult MojoWriteMessage(MojoHandle message_pipe_handle,
......
...@@ -29,8 +29,8 @@ class MOJO_SYSTEM_EXPORT Core { ...@@ -29,8 +29,8 @@ class MOJO_SYSTEM_EXPORT Core {
const MojoWaitFlags* flags, const MojoWaitFlags* flags,
uint32_t num_handles, uint32_t num_handles,
MojoDeadline deadline) = 0; MojoDeadline deadline) = 0;
virtual MojoResult CreateMessagePipe(MojoHandle* message_pipe_handle_0, virtual MojoResult CreateMessagePipe(MojoHandle* message_pipe_handle0,
MojoHandle* message_pipe_handle_1) = 0; MojoHandle* message_pipe_handle1) = 0;
virtual MojoResult WriteMessage(MojoHandle message_pipe_handle, virtual MojoResult WriteMessage(MojoHandle message_pipe_handle,
const void* bytes, const void* bytes,
uint32_t num_bytes, uint32_t num_bytes,
......
...@@ -148,11 +148,11 @@ MojoResult CoreImpl::WaitMany(const MojoHandle* handles, ...@@ -148,11 +148,11 @@ MojoResult CoreImpl::WaitMany(const MojoHandle* handles,
return WaitManyInternal(handles, flags, num_handles, deadline); return WaitManyInternal(handles, flags, num_handles, deadline);
} }
MojoResult CoreImpl::CreateMessagePipe(MojoHandle* message_pipe_handle_0, MojoResult CoreImpl::CreateMessagePipe(MojoHandle* message_pipe_handle0,
MojoHandle* message_pipe_handle_1) { MojoHandle* message_pipe_handle1) {
if (!VerifyUserPointer<MojoHandle>(message_pipe_handle_0, 1)) if (!VerifyUserPointer<MojoHandle>(message_pipe_handle0, 1))
return MOJO_RESULT_INVALID_ARGUMENT; return MOJO_RESULT_INVALID_ARGUMENT;
if (!VerifyUserPointer<MojoHandle>(message_pipe_handle_1, 1)) if (!VerifyUserPointer<MojoHandle>(message_pipe_handle1, 1))
return MOJO_RESULT_INVALID_ARGUMENT; return MOJO_RESULT_INVALID_ARGUMENT;
scoped_refptr<MessagePipeDispatcher> dispatcher_0( scoped_refptr<MessagePipeDispatcher> dispatcher_0(
...@@ -179,8 +179,8 @@ MojoResult CoreImpl::CreateMessagePipe(MojoHandle* message_pipe_handle_0, ...@@ -179,8 +179,8 @@ MojoResult CoreImpl::CreateMessagePipe(MojoHandle* message_pipe_handle_0,
dispatcher_0->Init(message_pipe, 0); dispatcher_0->Init(message_pipe, 0);
dispatcher_1->Init(message_pipe, 1); dispatcher_1->Init(message_pipe, 1);
*message_pipe_handle_0 = h0; *message_pipe_handle0 = h0;
*message_pipe_handle_1 = h1; *message_pipe_handle1 = h1;
return MOJO_RESULT_OK; return MOJO_RESULT_OK;
} }
......
...@@ -40,8 +40,8 @@ class MOJO_SYSTEM_IMPL_EXPORT CoreImpl : public Core { ...@@ -40,8 +40,8 @@ class MOJO_SYSTEM_IMPL_EXPORT CoreImpl : public Core {
uint32_t num_handles, uint32_t num_handles,
MojoDeadline deadline) OVERRIDE; MojoDeadline deadline) OVERRIDE;
virtual MojoResult CreateMessagePipe( virtual MojoResult CreateMessagePipe(
MojoHandle* message_pipe_handle_0, MojoHandle* message_pipe_handle0,
MojoHandle* message_pipe_handle_1) OVERRIDE; MojoHandle* message_pipe_handle1) OVERRIDE;
virtual MojoResult WriteMessage(MojoHandle message_pipe_handle, virtual MojoResult WriteMessage(MojoHandle message_pipe_handle,
const void* bytes, const void* bytes,
uint32_t num_bytes, uint32_t num_bytes,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment