libchrome: Several upstreamable fixes from libchrome

base/message_loop/message_pump_libevent.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/message_loop/message_pump_libevent.h"
 
 #include <errno.h>
 #include <unistd.h>
 
 #include <memory>
@@ skipping 69 matching lines @@
   event_ = e;
 }
 
 event *MessagePumpLibevent::FileDescriptorWatcher::ReleaseEvent() {
   struct event *e = event_;
   event_ = NULL;
   return e;
 }
 
 void MessagePumpLibevent::FileDescriptorWatcher::OnFileCanReadWithoutBlocking(
-    int fd, MessagePumpLibevent* pump) {
+    int fd,
+    MessagePumpLibevent* /* pump */) {

[danakj, 2016/05/23 02:59:55]

delete

[Luis Héctor Chávez, 2016/05/24 15:27:53]

Done.

   // Since OnFileCanWriteWithoutBlocking() gets called first, it can stop
   // watching the file descriptor.
   if (!watcher_)
     return;
   watcher_->OnFileCanReadWithoutBlocking(fd);
 }
 
 void MessagePumpLibevent::FileDescriptorWatcher::OnFileCanWriteWithoutBlocking(
-    int fd, MessagePumpLibevent* pump) {
+    int fd,
+    MessagePumpLibevent* /* pump */) {

[danakj, 2016/05/23 02:59:54]

delete

[Luis Héctor Chávez, 2016/05/24 15:27:53]

Done.

   DCHECK(watcher_);
   watcher_->OnFileCanWriteWithoutBlocking(fd);
 }
 
 MessagePumpLibevent::MessagePumpLibevent()
     : keep_running_(true),
       in_run_(false),
       processed_io_events_(false),
       event_base_(event_base_new()),
       wakeup_pipe_in_(-1),
@@ skipping 78 matching lines @@
   // Transfer ownership of evt to controller.
   controller->Init(evt.release());
 
   controller->set_watcher(delegate);
   controller->set_pump(this);
 
   return true;
 }
 
 // Tell libevent to break out of inner loop.
-static void timer_callback(int fd, short events, void *context)
-{
+static void timer_callback(int /* fd */, short /* events */, void* context) {

[danakj, 2016/05/23 02:59:54]

these need names to understand them though.. making them comments makes code
that doesn't follow the google style guide AFAICT. Can you contradict that?

[Luis Héctor Chávez, 2016/05/24 15:27:53]

The google style guide does allow parameter names as comments when they are
unused and are not obvious:
https://google.github.io/styleguide/cppguide.html#Function_Declarations_and_D...

It does not have whitespace around the name, though, so I'll change that.

[danakj, 2016/05/24 18:42:43]

Oh I see. It's not in the initial list of rules, but at the end of that section:
"Unused parameters that might not be obvious should comment out the variable
name in the function definition"

Okay.

   event_base_loopbreak((struct event_base *)context);
 }
 
 // Reentrant!
 void MessagePumpLibevent::Run(Delegate* delegate) {
   AutoReset<bool> auto_reset_keep_running(&keep_running_, true);
   AutoReset<bool> auto_reset_in_run(&in_run_, true);
 
   // event_base_loopexit() + EVLOOP_ONCE is leaky, see http://crbug.com/25641.
   // Instead, make our own timer and reuse it on each call to event_base_loop().
@@ skipping 130 matching lines @@
       controller->was_destroyed_ = nullptr;
   } else if (flags & EV_WRITE) {
     controller->OnFileCanWriteWithoutBlocking(fd, pump);
   } else if (flags & EV_READ) {
     controller->OnFileCanReadWithoutBlocking(fd, pump);
   }
 }
 
 // Called if a byte is received on the wakeup pipe.
 // static
-void MessagePumpLibevent::OnWakeup(int socket, short flags, void* context) {
+void MessagePumpLibevent::OnWakeup(int socket,
+                                   short /* flags */,
+                                   void* context) {
   MessagePumpLibevent* that = static_cast<MessagePumpLibevent*>(context);
   DCHECK(that->wakeup_pipe_out_ == socket);
 
   // Remove and discard the wakeup byte.
   char buf;
   int nread = HANDLE_EINTR(read(socket, &buf, 1));
   DCHECK_EQ(nread, 1);
   that->processed_io_events_ = true;
   // Tell libevent to break out of inner loop.
   event_base_loopbreak(that->event_base_);
 }
 
 }  // namespace base