Changeset 11083 for code/trunk/src/libraries

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

Files:

• core/GUIManager.cc (modified) (1 diff)
• core/class/SubclassIdentifier.h (modified) (3 diffs)
• core/input/KeyBinder.cc (modified) (1 diff)
• network/MasterServer.cc (modified) (3 diffs)
• network/packet/Gamestate.cc (modified) (1 diff)
• network/packet/ServerInformation.cc (modified) (3 diffs)
• util/Serialise.h (modified) (26 diffs)

code/trunk/src/libraries/core/GUIManager.cc

@@ -104 +104 @@
 #include "util/OrxAssert.h"
 #include "util/output/BaseWriter.h"
+#include "util/StringUtils.h"
+#include "util/SubString.h"
 #include "config/ConfigValueIncludes.h"
 #include "Core.h"

code/trunk/src/libraries/core/class/SubclassIdentifier.h

@@ -92 +92 @@
         public:
             /// Constructor: Automaticaly assigns the Identifier of the given class.
-            SubclassIdentifier()
+            SubclassIdentifier() : identifier_(nullptr)
             {
                 this->identifier_ = ClassIdentifier<T>::getIdentifier();
@@ -98 +98 @@
 
             /// Constructor: Assigns the given Identifier.
-            SubclassIdentifier(Identifier* identifier)
+            SubclassIdentifier(Identifier* identifier) : identifier_(nullptr)
             {
                 this->operator=(identifier);
@@ -105 +105 @@
             /// Copyconstructor: Assigns the identifier of another SubclassIdentifier.
             template <class O>
-            SubclassIdentifier(const SubclassIdentifier<O>& identifier)
+            SubclassIdentifier(const SubclassIdentifier<O>& identifier) : identifier_(nullptr)
             {
                 this->operator=(identifier.getIdentifier());

code/trunk/src/libraries/core/input/KeyBinder.cc

@@ -67 +67 @@
         for (unsigned int i = 0; i < KeyCode::numberOfKeys; i++)
         {
-            const std::string& keyname = KeyCode::ByString[i];
+            const std::string keyname = KeyCode::ByString[i];
             if (!keyname.empty())
                 keys_[i].name_ = std::string("Key") + keyname;

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 );

code/trunk/src/libraries/util/Serialise.h

@@ -48 +48 @@
     template <class T> inline uint32_t returnSize( const T& variable );
     /** @brief loads the value of a variable out of the bytestream and increases the mem pointer */
-    template <class T> inline void loadAndIncrease( const T& variable, uint8_t*& mem );
+    template <class T> inline void loadAndIncrease( T& variable, uint8_t*& mem );
     /** @brief saves the value of a variable into the bytestream and increases the mem pointer */
     template <class T> inline void saveAndIncrease( const T& variable, uint8_t*& mem );
@@ -57 +57 @@
   // =========== char*
 
-  inline uint32_t returnSize( char*& variable )
+  inline uint32_t returnSize(const char*& variable )
   {
     return strlen(variable)+1;
   }
 
-  inline void saveAndIncrease( char*& variable, uint8_t*& mem )
+  inline void saveAndIncrease(const char*& variable, uint8_t*& mem )
   {
-    strcpy((char*)mem, variable);
-    mem += returnSize(variable);
+    uint32_t len = returnSize(variable);
+    std::memcpy(mem, variable, len);
+    mem += len;
   }
 
@@ -72 +73 @@
     if( variable )
       delete variable;
-    uint32_t len = strlen((char*)mem)+1;
+    uint32_t len = returnSize((const char*&)mem);
     variable = new char[len];
-    strcpy((char*)variable, (char*)mem);
+    std::memcpy(variable, mem, len);
     mem += len;
   }
@@ -92 +93 @@
     }
 
-    template <> inline void loadAndIncrease( const bool& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( bool& variable, uint8_t*& mem )
     {
         *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
@@ -116 +117 @@
     }
 
-    template <> inline void loadAndIncrease( const char& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( char& variable, uint8_t*& mem )
     {
         *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
@@ -140 +141 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned char& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned char& variable, uint8_t*& mem )
     {
         *(uint8_t*)( &variable ) = *static_cast<uint8_t*>(mem);
@@ -164 +165 @@
     }
 
-    template <> inline void loadAndIncrease( const short& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( short& variable, uint8_t*& mem )
     {
         *(short*)( &variable ) = *(int16_t*)(mem);
@@ -188 +189 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned short& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned short& variable, uint8_t*& mem )
     {
         *(unsigned short*)( &variable ) = *(uint16_t*)(mem);
@@ -212 +213 @@
     }
 
-    template <> inline void loadAndIncrease( const int& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( int& variable, uint8_t*& mem )
     {
         *(int *)( &variable ) = *(int32_t*)(mem);
@@ -236 +237 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned int& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned int& variable, uint8_t*& mem )
     {
         *(unsigned int*)( &variable ) = *(uint32_t*)(mem);
@@ -260 +261 @@
     }
 
-    template <> inline void loadAndIncrease( const long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( long& variable, uint8_t*& mem )
     {
         *(long*)( &variable ) = *(int32_t*)(mem);
@@ -284 +285 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned long& variable, uint8_t*& mem )
     {
         *(unsigned long*)( &variable ) = *(uint32_t*)(mem);
@@ -308 +309 @@
     }
 
-    template <> inline void loadAndIncrease( const long long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( long long& variable, uint8_t*& mem )
     {
         *(long long*)( &variable ) = *(int64_t*)(mem);
@@ -332 +333 @@
     }
 
-    template <> inline void loadAndIncrease( const unsigned long long& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( unsigned long long& variable, uint8_t*& mem )
     {
         *(unsigned long long*)( &variable ) = *(uint64_t*)(mem);
@@ -356 +357 @@
     }
 
-    template <> inline void loadAndIncrease( const float& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( float& variable, uint8_t*& mem )
     {
         *(uint32_t*)( &variable ) = *(uint32_t*)(mem);
@@ -380 +381 @@
     }
 
-    template <> inline void loadAndIncrease( const double& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( double& variable, uint8_t*& mem )
     {
         *(uint64_t*)( &variable ) = *(uint64_t*)(mem);
@@ -404 +405 @@
     }
 
-    template <> inline void loadAndIncrease( const long double& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( long double& variable, uint8_t*& mem )
     {
         double temp;
@@ -438 +439 @@
     }
 
-    template <> inline void loadAndIncrease( const std::string& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( std::string& variable, uint8_t*& mem )
     {
         *(std::string*)( &variable ) = (const char *)mem;
@@ -464 +465 @@
     }
 
-    template <> inline void loadAndIncrease( const Degree& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Degree& variable, uint8_t*& mem )
     {
         Ogre::Real* r = (Ogre::Real*)mem;
@@ -491 +492 @@
     }
 
-    template <> inline void loadAndIncrease( const Radian& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Radian& variable, uint8_t*& mem )
     {
         Ogre::Real* r = (Ogre::Real*)mem;
@@ -517 +518 @@
     }
 
-    template <> inline void loadAndIncrease( const Vector2& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Vector2& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.x, mem );
@@ -542 +543 @@
     }
 
-    template <> inline void loadAndIncrease( const Vector3& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Vector3& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.x, mem );
@@ -570 +571 @@
     }
 
-    template <> inline void loadAndIncrease( const Vector4& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Vector4& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.w, mem );
@@ -600 +601 @@
     }
 
-    template <> inline void loadAndIncrease( const Quaternion& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( Quaternion& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.w, mem );
@@ -630 +631 @@
     }
 
-    template <> inline void loadAndIncrease( const ColourValue& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( ColourValue& variable, uint8_t*& mem )
     {
         loadAndIncrease( variable.r, mem );
@@ -657 +658 @@
     }
 
-    template <> inline void loadAndIncrease( const mbool& variable, uint8_t*& mem )
+    template <> inline void loadAndIncrease( mbool& variable, uint8_t*& mem )
     {
         loadAndIncrease( (unsigned char&)((mbool&)variable).getMemory(), mem );