diff options
| -rw-r--r-- | mojo/apps/js/bindings/core.cc | 10 | ||||
| -rw-r--r-- | mojo/public/system/core.h | 12 | ||||
| -rw-r--r-- | mojo/public/system/core_private.cc | 7 | ||||
| -rw-r--r-- | mojo/public/system/core_private.h | 4 | ||||
| -rw-r--r-- | mojo/system/core_impl.cc | 12 | ||||
| -rw-r--r-- | mojo/system/core_impl.h | 4 |
6 files changed, 24 insertions, 25 deletions
diff --git a/mojo/apps/js/bindings/core.cc b/mojo/apps/js/bindings/core.cc index 6b31737..fc7ac02 100644 --- a/mojo/apps/js/bindings/core.cc +++ b/mojo/apps/js/bindings/core.cc @@ -22,14 +22,14 @@ namespace js { namespace { gin::Dictionary CreateMessagePipe(const gin::Arguments& args) { - MojoHandle handle_0 = MOJO_HANDLE_INVALID; - MojoHandle handle_1 = MOJO_HANDLE_INVALID; - MojoResult result = MojoCreateMessagePipe(&handle_0, &handle_1); + MojoHandle handle0 = MOJO_HANDLE_INVALID; + MojoHandle handle1 = MOJO_HANDLE_INVALID; + MojoResult result = MojoCreateMessagePipe(&handle0, &handle1); CHECK(result == MOJO_RESULT_OK); gin::Dictionary dictionary = gin::Dictionary::CreateEmpty(args.isolate()); - dictionary.Set("handle0", handle_0); - dictionary.Set("handle1", handle_1); + dictionary.Set("handle0", handle0); + dictionary.Set("handle1", handle1); return dictionary; } diff --git a/mojo/public/system/core.h b/mojo/public/system/core.h index 923cd59..bb36748 100644 --- a/mojo/public/system/core.h +++ b/mojo/public/system/core.h @@ -348,20 +348,20 @@ MOJO_SYSTEM_EXPORT MojoResult MojoWaitMany(const MojoHandle* handles, // Creates a message pipe, which is a bidirectional communication channel for // 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 -// to handles for the two endpoints (ports) for the message pipe. +// handles. On success, |*message_pipe_handle0| and |*message_pipe_handle1| are +// set to handles for the two endpoints (ports) for the message pipe. // // Returns: // |MOJO_RESULT_OK| on success. -// |MOJO_RESULT_INVALID_ARGUMENT| if |message_pipe_handle_0| and/or -// |message_pipe_handle_1| do not appear to be valid pointers. +// |MOJO_RESULT_INVALID_ARGUMENT| if |message_pipe_handle0| and/or +// |message_pipe_handle1| do not appear to be valid pointers. // |MOJO_RESULT_RESOURCE_EXHAUSTED| if a process/system/quota/etc. limit has // been reached. // // TODO(vtl): Add an options struct pointer argument. MOJO_SYSTEM_EXPORT MojoResult MojoCreateMessagePipe( - MojoHandle* message_pipe_handle_0, - MojoHandle* message_pipe_handle_1); + MojoHandle* message_pipe_handle0, + MojoHandle* message_pipe_handle1); // 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 diff --git a/mojo/public/system/core_private.cc b/mojo/public/system/core_private.cc index f0bc3f1..8e5b701 100644 --- a/mojo/public/system/core_private.cc +++ b/mojo/public/system/core_private.cc @@ -36,11 +36,10 @@ MojoResult MojoWaitMany(const MojoHandle* handles, return g_core->WaitMany(handles, flags, num_handles, deadline); } -MojoResult MojoCreateMessagePipe(MojoHandle* message_pipe_handle_0, - MojoHandle* message_pipe_handle_1) { +MojoResult MojoCreateMessagePipe(MojoHandle* message_pipe_handle0, + MojoHandle* message_pipe_handle1) { assert(g_core); - return g_core->CreateMessagePipe(message_pipe_handle_0, - message_pipe_handle_1); + return g_core->CreateMessagePipe(message_pipe_handle0, message_pipe_handle1); } MojoResult MojoWriteMessage(MojoHandle message_pipe_handle, diff --git a/mojo/public/system/core_private.h b/mojo/public/system/core_private.h index b2608ea..7e39acc 100644 --- a/mojo/public/system/core_private.h +++ b/mojo/public/system/core_private.h @@ -29,8 +29,8 @@ class MOJO_SYSTEM_EXPORT Core { const MojoWaitFlags* flags, uint32_t num_handles, MojoDeadline deadline) = 0; - virtual MojoResult CreateMessagePipe(MojoHandle* message_pipe_handle_0, - MojoHandle* message_pipe_handle_1) = 0; + virtual MojoResult CreateMessagePipe(MojoHandle* message_pipe_handle0, + MojoHandle* message_pipe_handle1) = 0; virtual MojoResult WriteMessage(MojoHandle message_pipe_handle, const void* bytes, uint32_t num_bytes, diff --git a/mojo/system/core_impl.cc b/mojo/system/core_impl.cc index 79d7ea3..74cda83 100644 --- a/mojo/system/core_impl.cc +++ b/mojo/system/core_impl.cc @@ -148,11 +148,11 @@ MojoResult CoreImpl::WaitMany(const MojoHandle* handles, return WaitManyInternal(handles, flags, num_handles, deadline); } -MojoResult CoreImpl::CreateMessagePipe(MojoHandle* message_pipe_handle_0, - MojoHandle* message_pipe_handle_1) { - if (!VerifyUserPointer<MojoHandle>(message_pipe_handle_0, 1)) +MojoResult CoreImpl::CreateMessagePipe(MojoHandle* message_pipe_handle0, + MojoHandle* message_pipe_handle1) { + if (!VerifyUserPointer<MojoHandle>(message_pipe_handle0, 1)) 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; scoped_refptr<MessagePipeDispatcher> dispatcher_0( @@ -179,8 +179,8 @@ MojoResult CoreImpl::CreateMessagePipe(MojoHandle* message_pipe_handle_0, dispatcher_0->Init(message_pipe, 0); dispatcher_1->Init(message_pipe, 1); - *message_pipe_handle_0 = h0; - *message_pipe_handle_1 = h1; + *message_pipe_handle0 = h0; + *message_pipe_handle1 = h1; return MOJO_RESULT_OK; } diff --git a/mojo/system/core_impl.h b/mojo/system/core_impl.h index f7533a6..339dfc8 100644 --- a/mojo/system/core_impl.h +++ b/mojo/system/core_impl.h @@ -40,8 +40,8 @@ class MOJO_SYSTEM_IMPL_EXPORT CoreImpl : public Core { uint32_t num_handles, MojoDeadline deadline) OVERRIDE; virtual MojoResult CreateMessagePipe( - MojoHandle* message_pipe_handle_0, - MojoHandle* message_pipe_handle_1) OVERRIDE; + MojoHandle* message_pipe_handle0, + MojoHandle* message_pipe_handle1) OVERRIDE; virtual MojoResult WriteMessage(MojoHandle message_pipe_handle, const void* bytes, uint32_t num_bytes, |