Changeset 11083 for code/trunk/src/libraries/network

Timestamp:

Jan 21, 2016, 1:59:04 PM (9 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.

Location:

code/trunk/src/libraries/network

Files:

• MasterServer.cc (modified) (3 diffs)
• packet/Gamestate.cc (modified) (1 diff)
• packet/ServerInformation.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 )
     {

code/trunk/src/libraries/network/packet/Gamestate.cc

@@ -489 +489 @@
 Gamestate* Gamestate::diffVariables(Gamestate *base)
 {
-  assert(this && base); assert(data_ && base->data_);
+  assert(base); assert(data_ && base->data_);
   assert(!header_.isCompressed() && !base->header_.isCompressed());
   assert(!header_.isDiffed());

code/trunk/src/libraries/network/packet/ServerInformation.cc

@@ -55 +55 @@
       // Save ACK
       uint8_t* temp = event->packet->data;
-      char* ack = new char[strlen(LAN_DISCOVERY_ACK)+1];
+      char* ack = nullptr;
       loadAndIncrease((char*&)ack, temp);
 
@@ -64 +64 @@
       // Save Server Name
       loadAndIncrease(this->serverName_, temp);
+      delete[] ack;
     }
 
@@ -74 +75 @@
     {
       std::string payload = this->serverName_ + Ogre::StringConverter::toString(this->clientNumber_);
-      uint32_t size = returnSize((char*&)LAN_DISCOVERY_ACK) + returnSize(payload);
+      uint32_t size = returnSize(LAN_DISCOVERY_ACK) + returnSize(payload);
       uint8_t* temp = new uint8_t[size];
       uint8_t* temp2 = temp;
-      saveAndIncrease((char*&)LAN_DISCOVERY_ACK, temp2);
+      saveAndIncrease(LAN_DISCOVERY_ACK, temp2);
       saveAndIncrease(payload, temp2);
       ENetPacket* packet = enet_packet_create( temp, size, 0 );