Changeset 11083 for code/trunk/src/libraries/network/MasterServer.cc

Timestamp:

Jan 21, 2016, 1:59:04 PM (8 years ago)

Author:

muemart

Message:

Fix some clang-tidy warnings.
Also, Serialise.h was doing some C-style casts that ended up being const casts. I moved those const casts as close to the source as possible and changed the loadAndIncrease functions to not do that.

File:

• code/trunk/src/libraries/network/MasterServer.cc (modified) (3 diffs)

code/trunk/src/libraries/network/MasterServer.cc

@@ -253 +253 @@
     /* convert to string */
     std::string ip = std::string( addrconv );
+    /* output debug info about the data that has come */
+    helper_output_debug(event, addrconv);
     /* delete addrconv */
     if( addrconv ) free( addrconv );
@@ -259 +261 @@
     char * packetdata = (char *)event->packet->data;
 
-    /* output debug info about the data that has come */
-    helper_output_debug( event, addrconv );
 
     /* GAME SERVER OR CLIENT CONNECTION? */
@@ -332 +332 @@
   {
     /***** ENTER MAIN LOOP *****/
-    ENetEvent *event = (ENetEvent *)calloc(sizeof(ENetEvent), sizeof(char));
+    ENetEvent *event = (ENetEvent *)calloc(1, sizeof(ENetEvent));
     if( event == nullptr )
     {