Make Dispatcher::AddAwakable(), etc. always set *signals_state (if signals_state is non-null).

mojo/edk/system/data_pipe.cc

 // Copyright 2013 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 "mojo/edk/system/data_pipe.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <limits>
@@ skipping 388 matching lines @@
 
 MojoResult DataPipe::ProducerAddAwakable(Awakable* awakable,
                                          MojoHandleSignals signals,
                                          bool force,
                                          uint64_t context,
                                          HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_producer_no_lock());
 
   HandleSignalsState producer_state = impl_->ProducerGetHandleSignalsState();
+  if (signals_state)
+    *signals_state = producer_state;
   if (producer_state.satisfies(signals)) {
     if (force)
       producer_awakable_list_->Add(awakable, signals, context);
-    if (signals_state)
-      *signals_state = producer_state;
     return MOJO_RESULT_ALREADY_EXISTS;
   }
-  if (!producer_state.can_satisfy(signals)) {
-    if (signals_state)
-      *signals_state = producer_state;
+  if (!producer_state.can_satisfy(signals))
     return MOJO_RESULT_FAILED_PRECONDITION;
-  }
 
   producer_awakable_list_->Add(awakable, signals, context);
   return MOJO_RESULT_OK;
 }
 
 void DataPipe::ProducerRemoveAwakable(Awakable* awakable,
                                       HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_producer_no_lock());
   producer_awakable_list_->Remove(awakable);
@@ skipping 201 matching lines @@
 
 MojoResult DataPipe::ConsumerAddAwakable(Awakable* awakable,
                                          MojoHandleSignals signals,
                                          bool force,
                                          uint64_t context,
                                          HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_consumer_no_lock());
 
   HandleSignalsState consumer_state = impl_->ConsumerGetHandleSignalsState();
+  if (signals_state)
+    *signals_state = consumer_state;
   if (consumer_state.satisfies(signals)) {
     if (force)
       consumer_awakable_list_->Add(awakable, signals, context);
-    if (signals_state)
-      *signals_state = consumer_state;
     return MOJO_RESULT_ALREADY_EXISTS;
   }
-  if (!consumer_state.can_satisfy(signals)) {
-    if (signals_state)
-      *signals_state = consumer_state;
+  if (!consumer_state.can_satisfy(signals))
     return MOJO_RESULT_FAILED_PRECONDITION;
-  }
 
   consumer_awakable_list_->Add(awakable, signals, context);
   return MOJO_RESULT_OK;
 }
 
 void DataPipe::ConsumerRemoveAwakable(Awakable* awakable,
                                       HandleSignalsState* signals_state) {
   MutexLocker locker(&mutex_);
   DCHECK(has_local_consumer_no_lock());
   consumer_awakable_list_->Remove(awakable);
@@ skipping 211 matching lines @@
   SetProducerClosedNoLock();
 }
 
 void DataPipe::SetConsumerClosed() {
   MutexLocker locker(&mutex_);
   SetConsumerClosedNoLock();
 }
 
 }  // namespace system
 }  // namespace mojo