Changeset 4715

Timestamp:

10/18/06 19:55:29 (2 years ago)

Author:

erijo

Message:

The last of the un-inlining de/constructors. There's still a lot of CPU_*, CPT_* and similar, small classes (in licq_packets.h) that don't have an explicit destructor and thus have an implicit default inline destructor. But I don't think this matters much since they proabably never change.

Location:

trunk/licq

Files:

• include/licq_packets.h (modified) (29 diffs)
• src/icqpacket.cpp (modified) (16 diffs)

trunk/licq/include/licq_packets.h

@@ -43 +43 @@
 {
 public:
-    CPX_FileTransfer(ConstFileList &lFileList, const char *szFileName);
-
-    virtual ~CPX_FileTransfer();
-
-    bool IsValid()  { return m_bValid; }
-    ConstFileList GetFileList() { return m_lFileList; }
-    const char *GetFilename()   { return m_szFilename; }
-    const char *GetDescription() { return m_szDesc; }
-    unsigned long GetFileSize() { return m_nFileSize; }
-
-protected:
-    CPX_FileTransfer();
-
-    bool                    m_bValid;
-    char                    *m_szDesc;
-    char                    *m_szFilename;
-    ConstFileList               m_lFileList;
-    unsigned long               m_nFileSize;
+  CPX_FileTransfer(ConstFileList &lFileList, const char *szFileName);
+  virtual ~CPX_FileTransfer();
+
+  bool IsValid()    { return m_bValid; }
+  ConstFileList GetFileList()   { return m_lFileList; }
+  const char *GetFilename() { return m_szFilename; }
+  const char *GetDescription() { return m_szDesc; }
+  unsigned long GetFileSize()   { return m_nFileSize; }
+
+protected:
+  CPX_FileTransfer();
+
+  bool          m_bValid;
+  char          *m_szDesc;
+  char          *m_szFilename;
+  ConstFileList m_lFileList;
+  unsigned long m_nFileSize;
 };
 
@@ -70 +69 @@
 {
 public:
-   virtual ~CPacket() { if (buffer != NULL) delete buffer; }
+   virtual ~CPacket();
 
    CBuffer *getBuffer()  { return buffer; };
@@ -96 +95 @@
 
 protected:
-   CPacket() { buffer = NULL; };
+   CPacket();
 
    CBuffer *buffer;
@@ -114 +113 @@
 {
 public:
+  virtual ~CSrvPacketTcp();
+
   // Packet details
   virtual const unsigned char  Channel()     { return m_nChannel; }
@@ -155 +156 @@
 {
 public:
+   virtual ~CPacketUdp();
+
    virtual CBuffer *Finalize(INetSocket *);
    virtual const unsigned short Sequence() { return m_nSequence; }
@@ -199 +202 @@
 public:
   CPU_Logon(const char *_szPassword, const char *_szUin, unsigned short _nLogonStatus);
+  virtual ~CPU_Logon();
 protected:
   unsigned long  m_nLogonStatus;
@@ -209 +213 @@
 public:
    CPU_Logoff();
+   virtual ~CPU_Logoff();
 };
 
@@ -216 +221 @@
 public:
   CPU_SendCookie(const char *, int len);
+  virtual ~CPU_SendCookie();
 };
 
@@ -223 +229 @@
 public:
   CPU_CommonFamily(unsigned short Family, unsigned short SubType);
+  virtual ~CPU_CommonFamily();
 
 protected:
@@ -231 +238 @@
 {
 public:
-    CPU_GenericFamily(unsigned short Family, unsigned short SubType);
-
+  CPU_GenericFamily(unsigned short Family, unsigned short SubType);
+  virtual ~CPU_GenericFamily();
 };
 
@@ -268 +275 @@
 public:
   CPU_Register(const char *_szPasswd);
+  virtual ~CPU_Register();
 };
 #elif ICQ_VERSION > 6
@@ -274 +282 @@
 public:
   CPU_RegisterFirst();
+  virtual ~CPU_RegisterFirst();
 };
 
@@ -280 +289 @@
 public:
   CPU_Register(const char *_szPasswd);
+  virtual ~CPU_Register();
 };
 #endif
@@ -288 +298 @@
 public:
   CPU_VerifyRegistration();
+  virtual ~CPU_VerifyRegistration();
 };
 
@@ -295 +306 @@
 public:
   CPU_SendVerification(const char *, const char *);
+  virtual ~CPU_SendVerification();
 };
 
@@ -371 +383 @@
 public:
   CPU_AddPDINFOToServerList();
-  
+
   unsigned short GetSID()   { return m_nSID; }
   unsigned short GetGSID()  { return m_nGSID; }
-  
+
 protected:
   unsigned short m_nSID,
@@ -390 +402 @@
   unsigned short GetSID()   { return m_nSID; }
   unsigned short GetGSID()  { return m_nGSID; }
-  
+
 protected:
   unsigned short m_nSID,
@@ -407 +419 @@
 class CPU_ClearServerList : public CPU_CommonFamily
 {
- public:
+public:
   CPU_ClearServerList(UserStringList &, unsigned short);
 };
@@ -430 +442 @@
 {
 public:
-   CPU_SetStatus(unsigned long _nNewStatus);
+  CPU_SetStatus(unsigned long _nNewStatus);
 
 private:
-   unsigned long m_nNewStatus;
+  unsigned long m_nNewStatus;
 };
 
@@ -439 +451 @@
 {
 public:
-   CPU_SetStatusFamily();
-
-protected:
-   void InitBuffer();
-   unsigned long m_nNewStatus;
+  CPU_SetStatusFamily();
+
+protected:
+  void InitBuffer();
+  unsigned long m_nNewStatus;
 };
 
@@ -752 +764 @@
 public:
   CPU_FileTransfer(ICQUser *, ConstFileList &lFileList, const char *_szFile,
-           const char *_szDesc, unsigned short nLevel, bool bICBM);
+                   const char *_szDesc, unsigned short nLevel, bool bICBM);
 };
 
@@ -837 +849 @@
   CPU_InfoPluginListResp(ICQUser *u, unsigned long nMsgID1,
                          unsigned long nMsgID2, unsigned short nSequence);
-
 };
 
@@ -1102 +1113 @@
 public:
   CPU_Meta_SetAbout(const char *szAbout);
-  ~CPU_Meta_SetAbout();
+  virtual ~CPU_Meta_SetAbout();
   virtual const unsigned short SubCommand()  { return m_nMetaCommand; }
 protected:
@@ -1135 +1146 @@
 protected:
   unsigned short m_nMetaCommand;
-    
-    char *m_szPassword;
-    
+  char *m_szPassword;
+
 friend class CICQDaemon;
 };
@@ -1167 +1177 @@
 public:
   CPU_Meta_RequestAllInfo(const char *_szId);
-  virtual ~CPU_Meta_RequestAllInfo() { free(m_szId); }
+  virtual ~CPU_Meta_RequestAllInfo();
   virtual const unsigned short SubCommand()  { return m_nMetaCommand; }
   const char *Id()  {  return m_szId; }
@@ -1181 +1191 @@
 public:
   CPU_Meta_RequestBasicInfo(const char *_szId);
-  virtual ~CPU_Meta_RequestBasicInfo() { free(m_szId); }
+  virtual ~CPU_Meta_RequestBasicInfo();
   virtual const unsigned short SubCommand()  { return m_nMetaCommand; }
   const char *Id()  {  return m_szId; }
@@ -1277 +1287 @@
   unsigned long SessionId() { return m_nSessionId; }
   unsigned long Id() { return m_nId; }
-  
+
 protected:
   char m_nHandshake;
@@ -1353 +1363 @@
    bool           m_bPluginReq;
    size_t         m_nMsgLen;
-   
+
    char *m_szLocalPortOffset;
    unsigned short m_nLevel;
@@ -1453 +1463 @@
   CPT_Ack(unsigned short _nSubCommand, unsigned short _nSequence,
      bool _bAccept, bool _bUrgent, ICQUser *_cUser);
+  virtual ~CPT_Ack();
 };
 

trunk/licq/src/icqpacket.cpp

@@ -287 +287 @@
 }
 
+CSrvPacketTcp::~CSrvPacketTcp()
+{
+  // Empty
+}
+
 CBuffer *CSrvPacketTcp::Finalize(INetSocket *)
 {
@@ -499 +504 @@
 unsigned short CPacket::s_nLocalPort = 0;
 char CPacket::s_nMode = MODE_DIRECT;
+
+CPacket::CPacket() : buffer(NULL)
+{
+  // Empty
+}
+
+CPacket::~CPacket()
+{
+  delete buffer;
+}
 
 //----SetIps-----------------------------------------------------------------
@@ -574 +589 @@
 }
 
+CPacketUdp::~CPacketUdp()
+{
+  // Empty
+}
 
 void CPacketUdp::InitBuffer()
@@ -655 +674 @@
 }
 
+CPU_Register::~CPU_Register()
+{
+  // Empty
+}
+
 #elif ICQ_VERSION >= 7
 
@@ -671 +695 @@
 
   buffer->PackUnsignedLongBE(1);
+}
+
+CPU_RegisterFirst::~CPU_RegisterFirst()
+{
+  // Empty
 }
 
@@ -695 +724 @@
 }
 
+CPU_Register::~CPU_Register()
+{
+  // Empty
+}
+
 #endif
 
@@ -703 +737 @@
   
   InitBuffer();
+}
+
+CPU_VerifyRegistration::~CPU_VerifyRegistration()
+{
+  // Empty
 }
 
@@ -732 +771 @@
 }
 
+CPU_SendVerification::~CPU_SendVerification()
+{
+  // Empty
+}
+
 //-----Logon--------------------------------------------------------------------
 CPU_Logon::CPU_Logon(const char *szPassword, const char *szUin, unsigned short _nLogonStatus)
@@ -798 +842 @@
 }
 
+CPU_Logon::~CPU_Logon()
+{
+  // Empty
+}
+
 //-----SendCookie------------------------------------------------------------
 CPU_SendCookie::CPU_SendCookie(const char *szCookie, int nLen)
@@ -811 +860 @@
   buffer->PackUnsignedLongBE(0x00000001);
   buffer->PackTLV(0x0006, nLen, szCookie);
+}
+
+CPU_SendCookie::~CPU_SendCookie()
+{
+  // Empty
 }
 
@@ -1157 +1211 @@
 }
 
+CPU_GenericFamily::~CPU_GenericFamily()
+{
+  // Empty
+}
+
 CPU_CommonFamily::CPU_CommonFamily(unsigned short Family, unsigned short SubType)
   : CSrvPacketTcp(ICQ_CHNxDATA)
@@ -1164 +1223 @@
   m_nFamily = Family;
   m_nSubType = SubType;
+}
+
+CPU_CommonFamily::~CPU_CommonFamily()
+{
+  // Empty
 }
 
@@ -2504 +2568 @@
 }
 
+CPU_Logoff::~CPU_Logoff()
+{
+  // Empty
+}
+
 //-----RequestList--------------------------------------------------------------
 CPU_RequestList::CPU_RequestList()
@@ -4009 +4078 @@
 }
 
+CPU_Meta_RequestAllInfo::~CPU_Meta_RequestAllInfo()
+{
+  free(m_szId);
+}
 
 //-----Meta_RequestInfo------------------------------------------------------
@@ -4028 +4101 @@
   buffer->PackUnsignedShort(m_nSubSequence);
   buffer->PackUnsignedLong(strtoul(m_szId, (char **)NULL, 10));
+}
+
+CPU_Meta_RequestBasicInfo::~CPU_Meta_RequestBasicInfo()
+{
+  free(m_szId);
 }
 
@@ -4923 +5001 @@
 }
 
+CPT_Ack::~CPT_Ack()
+{
+  // Empty
+}
 
 //-----AckGeneral---------------------------------------------------------------