From 0fd9aef8bf376d44132edded2cdcb41ba7ee5b2f Mon Sep 17 00:00:00 2001
From: Bjørn Lindeijer <bjorn@lindeijer.nl>
Date: Mon, 5 Jan 2009 21:16:23 +0100
Subject: Mostly whitespace and formatting changes

(merged from eAthena client)
---
 src/net/messagein.h |  4 ++--
 src/net/network.cpp | 46 +++++++++++++++++++++-------------------------
 2 files changed, 23 insertions(+), 27 deletions(-)

(limited to 'src/net')

diff --git a/src/net/messagein.h b/src/net/messagein.h
index 444699c8..f2390baa 100644
--- a/src/net/messagein.h
+++ b/src/net/messagein.h
@@ -61,13 +61,13 @@ class MessageIn
          * Returns the message length.
          */
         unsigned int
-        getLength() { return mLength; }
+        getLength() const { return mLength; }
 
         /**
          * Returns the length of unread data.
          */
         unsigned int
-        getUnreadLength() { return mLength - mPos; }
+        getUnreadLength() const { return mLength - mPos; }
 
     private:
         const char* mData;             /**< The message data. */
diff --git a/src/net/network.cpp b/src/net/network.cpp
index a4ea3def..57e368e2 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -83,8 +83,7 @@ Net::Connection *Net::getConnection()
     return new Net::Connection(client);
 }
 
-void
-Net::registerHandler(MessageHandler *handler)
+void Net::registerHandler(MessageHandler *handler)
 {
     for (const Uint16 *i = handler->handledMessages; *i; i++)
     {
@@ -92,8 +91,7 @@ Net::registerHandler(MessageHandler *handler)
     }
 }
 
-void
-Net::unregisterHandler(MessageHandler *handler)
+void Net::unregisterHandler(MessageHandler *handler)
 {
     for (const Uint16 *i = handler->handledMessages; *i; i++)
     {
@@ -101,8 +99,7 @@ Net::unregisterHandler(MessageHandler *handler)
     }
 }
 
-void
-Net::clearHandlers()
+void Net::clearHandlers()
 {
     mMessageHandlers.clear();
 }
@@ -114,26 +111,25 @@ Net::clearHandlers()
  */
 namespace
 {
-    void
-        dispatchMessage(ENetPacket *packet)
-        {
-            MessageIn msg((const char *)packet->data, packet->dataLength);
-
-            MessageHandlerIterator iter = mMessageHandlers.find(msg.getId());
-
-            if (iter != mMessageHandlers.end()) {
-                //logger->log("Received packet %x (%i B)",
-                //        msg.getId(), msg.getLength());
-                iter->second->handleMessage(msg);
-            }
-            else {
-                logger->log("Unhandled packet %x (%i B)",
-                        msg.getId(), msg.getLength());
-            }
-
-            // Clean up the packet now that we're done using it.
-            enet_packet_destroy(packet);
+    void dispatchMessage(ENetPacket *packet)
+    {
+        MessageIn msg((const char *)packet->data, packet->dataLength);
+
+        MessageHandlerIterator iter = mMessageHandlers.find(msg.getId());
+
+        if (iter != mMessageHandlers.end()) {
+            //logger->log("Received packet %x (%i B)",
+            //        msg.getId(), msg.getLength());
+            iter->second->handleMessage(msg);
         }
+        else {
+            logger->log("Unhandled packet %x (%i B)",
+                    msg.getId(), msg.getLength());
+        }
+
+        // Clean up the packet now that we're done using it.
+        enet_packet_destroy(packet);
+    }
 }
 
 void Net::flush()
-- 
cgit v1.2.3-60-g2f50