Resolved suggestions, ran clang-format on net/packets/*

Author: henrymkw

src/net/MiscPacketHandler.hpp

@@ -22,7 +22,6 @@ class MiscPacketHandler {
 private:
   u8 _000;
   bool m_unk1;
-  u8 _[0x003 - 0x001]; // padding, probably
   u32 m_unkBitfield_4;
   u32 m_unkBitfield_8;
   u32 m_unkBitfield_C;

src/net/NetManager.cpp

@@ -437,7 +437,7 @@ void NetManager::DWCSetBuddyFriendCallback(u32 r3, NetManager* netManager) {
 }
 
 void NetManager::initMMInfos() {
-  for (u32 i = 0; i < 2; i++) {
+  for (u32 i = 0; i < ARRAY_SIZE(m_matchMakingInfos); i++) {
     m_matchMakingInfos[i].m_MMStartTime = 0;
     m_matchMakingInfos[i].m_numConnectedConsoles = 0;
     m_matchMakingInfos[i].m_playerCount = 0;
@@ -455,12 +455,13 @@ void NetManager::initMMInfos() {
 }
 
 void NetManager::resetFriends() {
-  for (u32 i = 0; i < MAX_FRIEND_COUNT; i++)
+  for (u32 i = 0; i < ARRAY_SIZE(m_friends); i++) {
     resetFriendData(i);
+  }
 }
 
 void NetManager::resetPlayerIdToAidMap() {
-  for (u32 i = 0; i < MAX_PLAYER_COUNT; i++)
+  for (u32 i = 0; i < ARRAY_SIZE(m_playerIdToAidMapping); i++)
     m_playerIdToAidMapping[i] = -1;
 }
 
@@ -471,12 +472,12 @@ void NetManager::updateAidMapping() {
   if (RACEHEADER1Handler::getInstance()) {
     const u8* RH1AidMapping =
         RACEHEADER1Handler::getInstance()->getPlayerIdToAidMapping();
-    for (u32 i = 0; i < MAX_PLAYER_COUNT; i++)
+    for (u32 i = 0; i < ARRAY_SIZE(m_playerIdToAidMapping); i++)
       m_playerIdToAidMapping[i] = RH1AidMapping[i];
   } else if (SELECTHandler::getInstance()) {
     const u8* selectAidMapping =
         SELECTHandler::getInstance()->getPlayerIdToAidMapping();
-    for (u32 i = 0; i < MAX_PLAYER_COUNT; i++)
+    for (u32 i = 0; i < ARRAY_SIZE(m_playerIdToAidMapping); i++)
       m_playerIdToAidMapping[i] = selectAidMapping[i];
   } else {
     resetPlayerIdToAidMap();
@@ -486,7 +487,7 @@ void NetManager::updateAidMapping() {
 s32 NetManager::getLocalId(u32 hudId) const {
   u8 myAid = m_matchMakingInfos[m_currMMInfo].m_myAid;
   s32 count = -1;
-  for (s32 i = 0; i < MAX_PLAYER_COUNT; i++) {
+  for (s32 i = 0; i < ARRAY_SIZE(m_playerIdToAidMapping); i++) {
     if (m_playerIdToAidMapping[i] == myAid) {
       count++;
       if (count == hudId)

src/net/packets/EVENT.cpp

@@ -1,5 +1,3 @@
 #include "EVENT.hpp"
 
-namespace Net {
-
-}
+namespace Net {}

src/net/packets/EVENT.hpp

@@ -11,18 +11,15 @@ static_assert(sizeof(EVENTPacket) == 0xf8);
 
 class EVENTHandler {
 public:
-
   static void createStaticInstance();
- 
-  static EVENTHandler *getInstance() {
-    return spInstance;
-  }
+
+  static EVENTHandler* getInstance() { return spInstance; }
 
 private:
   u8 _0000[0x2b88 - 0x0000];
 
-  static EVENTHandler *spInstance;
+  static EVENTHandler* spInstance;
 };
-static_assert(sizeof(EVENTHandler) == 0x2b88); 
+static_assert(sizeof(EVENTHandler) == 0x2b88);
 
-}
+} // namespace Net

src/net/packets/HEADER.hpp

@@ -9,4 +9,4 @@ struct HEADERPacket {
 };
 static_assert(sizeof(HEADERPacket) == 0x10);
 
-}
+} // namespace Net

src/net/packets/ITEM.cpp

@@ -1,5 +1,3 @@
 #include "ITEM.hpp"
 
-namespace Net {
-    
-}
+namespace Net {}

src/net/packets/ITEM.hpp

@@ -11,17 +11,15 @@ static_assert(sizeof(ITEMPacket) == 0x8);
 
 class ITEMHandler {
 public:
-
   static void createStaticInstance();
 
-  static ITEMHandler *getInstance() {
-    return spInstance;
-  }
+  static ITEMHandler* getInstance() { return spInstance; }
+
 private:
   u8 _000[0x184 - 0x000];
-  
-  static ITEMHandler *spInstance;
+
+  static ITEMHandler* spInstance;
 };
 static_assert(sizeof(ITEMHandler) == 0x184);
 
-}
+} // namespace Net

src/net/packets/PacketHolder.hpp

@@ -4,21 +4,19 @@
 
 namespace Net {
 
-template <typename T>
-class PacketHolder {
+template <typename T> class PacketHolder {
 public:
   PacketHolder(u32 bufferSize);
   ~PacketHolder();
 
   void reset();
-  void copy(T *src, u32 len);
-  void append(T *src, u32 len);
+  void copy(T* src, u32 len);
+  void append(T* src, u32 len);
 
 private:
-  T *packet;
+  T* packet;
   u32 bufferSize;
   u32 packetSize;
-
 };
 
-}
+} // namespace Net

src/net/packets/RACEDATA.hpp

@@ -9,4 +9,4 @@ class RACEDATAPacket {
 };
 static_assert(sizeof(RACEDATAPacket) == 0x40);
 
-}
+} // namespace Net

src/net/packets/RACEHEADER1.cpp

@@ -16,24 +16,21 @@ s32 RACEHEADER1Handler::getCourseId() const {
   u32 adjustedCourseId;
   s32 result;
   for (u8 i = 0; i < MAX_PLAYER_COUNT; i++) {
-    const RACEHEADER1Data *data = &m_RH1Datas[i];
+    const RACEHEADER1Data* data = &m_RH1Datas[i];
     adjustedCourseId = data->courseId;
-    if (adjustedCourseId <= 0x42) {  
+    if (adjustedCourseId <= 0x42) {
       adjustedCourseId = data->courseId;
       otherCourseId = data->courseId;
-    }
-    else {
+    } else {
       otherCourseId = -1;
     }
 
     if (otherCourseId != -1 && data->_00 != 0) {
       if (adjustedCourseId <= 0x42) {
-        result = data->courseId;
-      }
-      else {
-        result = -1;
+        return data->courseId;
+      } else {
+        return -1;
       }
-      return result;
     }
   }
   return -1;
@@ -45,25 +42,25 @@ bool RACEHEADER1Handler::courseValid() const {
   s32 adjustedCourseId;
   System::CourseId courseId;
 
-  if (!NetManager::getInstance()->hasFoundMatch() ) {
+  if (!NetManager::getInstance()->hasFoundMatch()) {
     result = false;
-  }
-  else {
-    if (m_unk8 != 0)  {
-      NetManager *netManager = NetManager::getInstance();
-      u32 myAidSlot = 1 << netManager->m_matchMakingInfos[netManager->m_currMMInfo].m_myAid;
-      u32 fullBitmap =netManager->m_matchMakingInfos[netManager->m_currMMInfo].m_fullAidBitmap;  
+  } else {
+    if (m_unk8 != 0) {
+      NetManager* netManager = NetManager::getInstance();
+      u32 myAidSlot =
+          1 << netManager->m_matchMakingInfos[netManager->m_currMMInfo].m_myAid;
+      u32 fullBitmap = netManager->m_matchMakingInfos[netManager->m_currMMInfo]
+                           .m_fullAidBitmap;
       myAidSlot = fullBitmap & (m_unk8 | myAidSlot);
       result = (fullBitmap == myAidSlot);
-    }
-    else {
+    } else {
       result = false;
-    }    
+    }
   }
   if (result) {
     return getCourseId() != -1;
   }
   return result;
 }
 
-}
+} // namespace Net