From 676dc8b5accfa1e454ce5369e3ca596e9e7886d0 Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Fri, 20 Oct 2006 14:21:33 +0200
Subject: [PATCH] fix coding style

---
 src/simulator/event-impl.cc     |  5 +++--
 src/simulator/scheduler-heap.cc | 30 ++++++++++++++++++------------
 src/simulator/scheduler-list.cc | 10 ++++++----
 src/simulator/scheduler-map.cc  |  2 +-
 src/simulator/scheduler.cc      | 13 +++++++++----
 5 files changed, 37 insertions(+), 23 deletions(-)

diff --git a/src/simulator/event-impl.cc b/src/simulator/event-impl.cc
index 6645e1031..dd174fbf3 100644
--- a/src/simulator/event-impl.cc
+++ b/src/simulator/event-impl.cc
@@ -35,9 +35,10 @@ EventImpl::EventImpl ()
 void 
 EventImpl::Invoke (void)
 {
-    if (!m_cancel) {
+    if (!m_cancel) 
+      {
         Notify ();
-    }
+      }
 }
 void 
 EventImpl::SetInternalIterator (void *tag)
diff --git a/src/simulator/scheduler-heap.cc b/src/simulator/scheduler-heap.cc
index 7eefdd106..746155079 100644
--- a/src/simulator/scheduler-heap.cc
+++ b/src/simulator/scheduler-heap.cc
@@ -157,10 +157,11 @@ SchedulerHeap::BottomUp (void)
 {
     uint32_t index = Last ();
     while (!IsRoot (index) && 
-           IsLess (index, Parent (index))) { 
+           IsLess (index, Parent (index))) 
+      { 
         Exch(index, Parent (index)); 
         index = Parent (index); 
-    }
+      }
 }
 
 void
@@ -168,27 +169,32 @@ SchedulerHeap::TopDown (void)
 {
     uint32_t index = Root ();
     uint32_t right = RightChild (index);
-    while (!IsBottom (right)) {
+    while (!IsBottom (right)) 
+      {
         uint32_t left = LeftChild (index);
         uint32_t tmp = Smallest (left, right);
-        if (IsLess (index, tmp)) {
+        if (IsLess (index, tmp)) 
+          {
             return;
-        }
+          }
         Exch (index, tmp);
         index = tmp;
         right = RightChild (index);
-    }
-    if (IsBottom (index)) {
+      }
+    if (IsBottom (index)) 
+      {
         return;
-    }
+      }
     assert (!IsBottom (index));
     uint32_t left = LeftChild (index);
-    if (IsBottom (left)) {
+    if (IsBottom (left)) 
+      {
         return;
-    }
-    if (IsLess (index, left)) {
+      }
+    if (IsLess (index, left)) 
+      {
         return;
-    }
+      }
     Exch (index, left);
 }
 
diff --git a/src/simulator/scheduler-list.cc b/src/simulator/scheduler-list.cc
index 3af413139..4aedccc37 100644
--- a/src/simulator/scheduler-list.cc
+++ b/src/simulator/scheduler-list.cc
@@ -63,12 +63,14 @@ EventId
 SchedulerList::RealInsert (EventImpl *event, Scheduler::EventKey key)
 {
     Scheduler::EventKeyCompare compare;
-    for (EventsI i = m_events.begin (); i != m_events.end (); i++) {
-        if (compare (key, i->second)) {
+    for (EventsI i = m_events.begin (); i != m_events.end (); i++) 
+      {
+        if (compare (key, i->second)) 
+          {
             m_events.insert (i, std::make_pair (event, key));
             return GetEventId (key, i);
-        }
-    }
+          }
+      }
     m_events.push_back (std::make_pair (event, key));
     return GetEventId (key, --(m_events.end ()));
 }
diff --git a/src/simulator/scheduler-map.cc b/src/simulator/scheduler-map.cc
index 46d3412ad..4739ccc3e 100644
--- a/src/simulator/scheduler-map.cc
+++ b/src/simulator/scheduler-map.cc
@@ -57,7 +57,7 @@ SchedulerMap::GetFromEvent (EventImpl *ev) const
     EventMapI i;
     void *tag = ev->GetInternalIterator ();
     memcpy (&i, &(tag), sizeof (i));
-     return i;
+    return i;
 }
 
 EventId
diff --git a/src/simulator/scheduler.cc b/src/simulator/scheduler.cc
index 045203caf..9fb532150 100644
--- a/src/simulator/scheduler.cc
+++ b/src/simulator/scheduler.cc
@@ -36,13 +36,18 @@ bool
 Scheduler::EventKeyCompare::operator () (struct EventKey a, struct EventKey b)
 {
     assert (a.m_uid != b.m_uid);
-    if (a.m_ns < b.m_ns) {
+    if (a.m_ns < b.m_ns) 
+      {
         return true;
-    } else if (a.m_ns == b.m_ns && a.m_uid < b.m_uid) {
+      } 
+    else if (a.m_ns == b.m_ns && a.m_uid < b.m_uid) 
+      {
         return true;
-    } else {
+      } 
+    else 
+      {
         return false;
-    }
+      }
 }