Changeset 4591

Timestamp:

09/03/06 06:52:19 (2 years ago)

Author:

erijo

Message:

Applied patch from root_42 (#1387) to fix some compiler warnings.

Location:

trunk/licq

Files:

• include/licq_message.h (modified) (1 diff)
• src/icqd-srv.cpp (modified) (1 diff)
• src/user.cpp (modified) (3 diffs)

trunk/licq/include/licq_message.h

@@ -55 +55 @@
    direction Direction()  {  return m_eDir; }
    CICQColor *Color() { return &m_sColor; }
-   int ConvoId() { return m_nConvoId; }
+   unsigned long ConvoId() { return m_nConvoId; }
    
    bool Pending() { return m_bPending; }

trunk/licq/src/icqd-srv.cpp

@@ -2288 +2288 @@
   case ICQ_SNACxSRV_ACKxIMxICQ:
     {
-      ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
-      unsigned long nListTime = o->GetSSTime();
-      gUserManager.DropOwner(LICQ_PPID);
+      // ICQOwner *o = gUserManager.FetchOwner(LICQ_PPID, LOCK_R);
+      // unsigned long nListTime = o->GetSSTime();
+      // gUserManager.DropOwner(LICQ_PPID);
 
       CSrvPacketTcp* p;

trunk/licq/src/user.cpp

@@ -2793 +2793 @@
   unsigned long i = 0, j, nField = 0, nPos = 0;
   char szTemp[128];
-  const char *sz;
 
   // Our secure string for escaping stuff
@@ -2855 +2854 @@
       }
 
+      const char *sz = 0;
       switch(_szFormat[i])
       {
@@ -3027 +3027 @@
       }
 
+      if (!sz)
+        continue;
+
       // If we need to be secure, then quote the % string
       if (bSecure)