Changeset 6389 for trunk/rms

Timestamp:

07/02/08 06:04:48 (5 months ago)

Author:

flynd

Message:

Some more uin function calls changed and added a missing free().

Files:

• trunk/rms/src/rms.cpp (modified) (7 diffs)

trunk/rms/src/rms.cpp

@@ -794 +794 @@
   //XXX Handle the case when we have the owner
   if (szId == 0)
-    m_nUin = gUserManager.OwnerUin();
+    m_nUin = strtoul(gUserManager.OwnerId(LICQ_PPID).c_str(), (char**)NULL, 10);
 
   // Print the user info
@@ -1485 +1485 @@
     fprintf(fs, "%d User not added\n", CODE_ADDUSERxERROR);
   }
-  
+
+  free(szId);
   return fflush(fs);
 }
@@ -1504 +1505 @@
   if (nUin >= 10000)
   {
-    licqDaemon->RemoveUserFromList(nUin);
+    licqDaemon->RemoveUserFromList(data_arg, LICQ_PPID);
     fprintf(fs, "%d User removed\n", CODE_REMUSERxDONE);
   }
@@ -1533 +1534 @@
     return fflush(fs);
   }
-  
-
-  if (isdigit(*data_arg))
-  {
-    nUin = strtoul(data_arg, (char**)NULL, 10);
-    while (*data_arg != '\0' && *data_arg != ' ') data_arg++;
-    NEXT_WORD(data_arg);
-  }
-   else
+
+  if (!isdigit(*data_arg))
   {
     fprintf(fs, "%d Invalid UIN.\n", CODE_INVALIDxUSER);
     return fflush(fs);
   }
+  char* id = strdup(data_arg);
+  nUin = strtoul(data_arg, (char**)NULL, 10);
+  while (*data_arg != '\0' && *data_arg != ' ') data_arg++;
+  NEXT_WORD(data_arg);
 
   if (nUin < 10000)
@@ -1556 +1554 @@
   {
     fprintf(fs, "%d Opening secure connection.\n", CODE_SECURExOPEN);
-    licqDaemon->icqOpenSecureChannel(nUin);
+    licqDaemon->icqOpenSecureChannel(id);
   }
   else
@@ -1562 +1560 @@
   {
     fprintf(fs, "%d Closing secure connection.\n", CODE_SECURExCLOSE);
-    licqDaemon->icqCloseSecureChannel(nUin);
+    licqDaemon->icqCloseSecureChannel(id);
   }
   else
   {
-   ICQUser *u = gUserManager.FetchUser(nUin,LOCK_R);
+    ICQUser* u = gUserManager.FetchUser(id, LICQ_PPID, LOCK_R);
    if (u->Secure() == 0)
    {
@@ -1577 +1575 @@
    gUserManager.DropUser(u);
   }
-  
-  return fflush(fs);
-}
+
+  free(id);
+  return fflush(fs);
+}