MachMessageServer::Interface implementations: minor cleanups

util/mach/child_port_handshake.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 243 matching lines @@
   std::swap(child_port_, child_port);
   return child_port;
 }
 
 kern_return_t ChildPortHandshake::HandleChildPortCheckIn(
     child_port_server_t server,
     const child_port_token_t token,
     mach_port_t port,
     mach_msg_type_name_t right_type,
     const mach_msg_trailer_t* trailer,
-    bool* destroy_complex_request) {
+    bool* destroy_request) {
   DCHECK_EQ(child_port_, kMachPortNull);
 
   if (token != token_) {
     // If the token’s not correct, someone’s attempting to spoof the legitimate
     // client.
     LOG(WARNING) << "ignoring incorrect token";
-    *destroy_complex_request = true;
+    *destroy_request = true;
   } else {
     checked_in_ = true;
 
     if (right_type == MACH_MSG_TYPE_PORT_RECEIVE) {
       // The message needs to carry a send right or a send-once right. This
       // isn’t a strict requirement of the protocol, but users of this class
       // expect a send right or a send-once right, both of which can be managed
       // by base::mac::ScopedMachSendRight. It is invalid to store a receive
       // right in that scoper.
       LOG(WARNING) << "ignoring MACH_MSG_TYPE_PORT_RECEIVE";
-      *destroy_complex_request = true;
+      *destroy_request = true;
     } else {
       // Communicate the child port back to the RunServer().
-      // *destroy_complex_request is left at false, because RunServer() needs
-      // the right to remain intact. It gives ownership of the right to its
-      // caller.
+      // *destroy_request is left at false, because RunServer() needs the right
+      // to remain intact. It gives ownership of the right to its caller.
       child_port_ = port;
     }
   }
 
   // This is a MIG simpleroutine, there is no reply message.
   return MIG_NO_REPLY;
 }
 
 // static
 void ChildPortHandshake::RunClient(int pipe_read,
@@ skipping 42 matching lines @@
       bootstrap_look_up(bootstrap_port, service_name.c_str(), &server_port);
   BOOTSTRAP_CHECK(kr == BOOTSTRAP_SUCCESS, kr) << "bootstrap_look_up";
   base::mac::ScopedMachSendRight server_port_owner(server_port);
 
   // Check in with the server.
   kr = child_port_check_in(server_port, token, port, right_type);
   MACH_CHECK(kr == KERN_SUCCESS, kr) << "child_port_check_in";
 }
 
 }  // namespace crashpad