Cleanup in //runtime/bin

runtime/bin/eventhandler.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "bin/dartutils.h"
 #include "bin/eventhandler.h"
 #include "bin/lockers.h"
 #include "bin/socket.h"
 #include "bin/thread.h"
 
 #include "include/dart_api.h"
 
-
 namespace dart {
 namespace bin {
 
-
 void TimeoutQueue::UpdateTimeout(Dart_Port port, int64_t timeout) {
   // Find port if present.
   Timeout* last = NULL;
   Timeout* current = timeouts_;
   while (current != NULL) {
     if (current->port() == port) {
       // Found.
       if (timeout < 0) {
         // Remove from list and delete existing.
         if (last != NULL) {
@@ skipping 12 matching lines @@
     current = current->next();
   }
   if (current == NULL && timeout >= 0) {
     // Not found, create a new.
     timeouts_ = new Timeout(port, timeout, timeouts_);
   }
   // Clear and find next timeout.
   next_timeout_ = NULL;
   current = timeouts_;
   while (current != NULL) {
-    if (next_timeout_ == NULL ||
-        current->timeout() < next_timeout_->timeout()) {
+    if ((next_timeout_ == NULL) ||
+        (current->timeout() < next_timeout_->timeout())) {
       next_timeout_ = current;
     }
     current = current->next();
   }
 }
 
 
 static EventHandler* event_handler = NULL;
 static Monitor *shutdown_monitor = NULL;
 
 
 void EventHandler::Start() {
   // Initialize global socket registry.
   ListeningSocketRegistry::Initialize();
 
   ASSERT(event_handler == NULL);
   shutdown_monitor = new Monitor();
   event_handler = new EventHandler();
   event_handler->delegate_.Start(event_handler);
 }
 
 
 void EventHandler::NotifyShutdownDone() {
   MonitorLocker ml(shutdown_monitor);
   ml.Notify();
 }
 
 
 void EventHandler::Stop() {
-  if (event_handler == NULL) return;
+  if (event_handler == NULL) {
+    return;
+  }
 
   // Wait until it has stopped.
   {
     MonitorLocker ml(shutdown_monitor);
 
     // Signal to event handler that we want it to stop.
     event_handler->delegate_.Shutdown();
     ml.Wait(Monitor::kNoTimeout);
   }
 
   // Cleanup
   delete event_handler;
   event_handler = NULL;
   delete shutdown_monitor;
   shutdown_monitor = NULL;
 
   // Destroy the global socket registry.
   ListeningSocketRegistry::Cleanup();
 }
 
 
 EventHandlerImplementation* EventHandler::delegate() {
-  if (event_handler == NULL) return NULL;
+  if (event_handler == NULL) {
+    return NULL;
+  }
   return &event_handler->delegate_;
 }
 
 
 /*
  * Send data to the EventHandler thread to register for a given instance
  * args[0] a ReceivePort args[1] with a notification event args[2].
  */
 void FUNCTION_NAME(EventHandler_SendData)(Dart_NativeArguments args) {
   Dart_Handle sender = Dart_GetNativeArgument(args, 0);
@@ skipping 18 matching lines @@
 
 
 void FUNCTION_NAME(EventHandler_TimerMillisecondClock)(
     Dart_NativeArguments args) {
   int64_t now = TimerUtils::GetCurrentMonotonicMillis();
   Dart_SetReturnValue(args, Dart_NewInteger(now));
 }
 
 }  // namespace bin
 }  // namespace dart