Changeset 6461 for trunk/console

Timestamp:

07/24/08 03:58:36 (4 months ago)

Author:

flynd

Message:

Fixed some cases where we kept a pointer to the alias string in the daemon user object. Added a few const.

Location:

trunk/console/src

Files:

• console.cpp (modified) (1 diff)
• console.h (modified) (2 diffs)
• console_menu.cpp (modified) (7 diffs)
• console_print.cpp (modified) (2 diffs)
• window.cpp (modified) (2 diffs)
• window.h (modified) (1 diff)

trunk/console/src/console.cpp

@@ -1467 +1467 @@
  * CLicqConsole::SaveLastUser
  *-------------------------------------------------------------------------*/
-void CLicqConsole::SaveLastUser(const char *szId, unsigned long nPPID)
+void CLicqConsole::SaveLastUser(const string& id, unsigned long nPPID)
 {
   // Save this as the last user
-  if (winMain->sLastContact.szId == 0 ||
-      !(strcmp(szId, winMain->sLastContact.szId) == 0 &&
+  if (winMain->sLastContact.szId.empty() ||
+      !(id == winMain->sLastContact.szId &&
       nPPID == winMain->sLastContact.nPPID))
   {
-    if (winMain->sLastContact.szId)
-      free(winMain->sLastContact.szId);
     winMain->sLastContact.nPPID = nPPID;
-    winMain->sLastContact.szId = strdup(szId);
+    winMain->sLastContact.szId = id;
     PrintStatus();
   }

trunk/console/src/console.h

@@ -154 +154 @@
   void PrintFileStat(CFileTransferManager *);
   void PrintMacros();
-  void PrintContactPopup(char *);
+  void PrintContactPopup(const char* alias);
 
   static int UserListCallback(EObjectType, void *, void *, chtype);
@@ -215 +215 @@
   bool ParseMacro(char *);
   std::string GetUserFromArg(char** p_szArg);
-  void SaveLastUser(const char *, unsigned long);
+  void SaveLastUser(const std::string& id, unsigned long ppid);
   struct SContact GetContactFromArg(char **);
 };

trunk/console/src/console_menu.cpp

@@ -679 +679 @@
   unsigned long nPPID = 0;
   struct SContact scon;
-  scon.szId = NULL;
   scon.nPPID = 0;
 
@@ -766 +765 @@
   }
   FOR_EACH_USER_END
-  if (scon.szId == NULL)
+  if (scon.szId.empty())
   {
     winMain->wprintf("%CInvalid user: %A%s\n", COLOR_RED, A_BOLD, szAlias);
-    scon.szId = NULL;
+    scon.szId.clear();
     scon.nPPID = (unsigned long)-1;
     return scon;
@@ -787 +786 @@
   struct SContact scon = GetContactFromArg(&sz);
 
-  if (!scon.szId && scon.nPPID != (unsigned long)-1)
+  if (scon.szId.empty() && scon.nPPID != (unsigned long)-1)
     winMain->wprintf("%CYou must specify a user to send a message to.\n", COLOR_RED);
   else if (scon.nPPID != (unsigned long)-1)
-    UserCommand_Msg(scon.szId, scon.nPPID, sz);
+    UserCommand_Msg(scon.szId.c_str(), scon.nPPID, sz);
 }
 
@@ -853 +852 @@
 
   char *sz = szArg;
-  char *szId = NULL;
+  string szId;
   unsigned long nPPID = (unsigned long)-1;
   struct SContact scon = GetContactFromArg(&sz);
-  
-  if (scon.szId == 0)
+
+  if (scon.szId.empty())
   {
     // Do nothing if there are no events pending
@@ -884 +883 @@
     }
     FOR_EACH_USER_END
-    if (szId != NULL)
-    {
-      UserCommand_View(szId, nPPID, NULL);
-    }
-  }
-  else if (scon.szId != NULL)
-  {
-    UserCommand_View(scon.szId, scon.nPPID, sz);
+    if (!szId.empty())
+    {
+      UserCommand_View(szId.c_str(), nPPID, NULL);
+    }
+  }
+  else if (!scon.szId.empty())
+  {
+    UserCommand_View(scon.szId.c_str(), scon.nPPID, sz);
   }
 
@@ -988 +987 @@
   struct SContact scon = GetContactFromArg(&sz);
 
-  if (gUserManager.FindOwner(scon.szId, scon.nPPID))
+  if (gUserManager.FindOwner(scon.szId.c_str(), scon.nPPID))
     winMain->wprintf("%CYou can't remove yourself!\n", COLOR_RED);
-  else if (!scon.szId && scon.nPPID != (unsigned long)-1)
+  else if (scon.szId.empty() && scon.nPPID != (unsigned long)-1)
     winMain->wprintf("%CYou must specify a user to remove.\n", COLOR_RED);
   else
-    UserCommand_Remove(scon.szId, scon.nPPID, sz);
+    UserCommand_Remove(scon.szId.c_str(), scon.nPPID, sz);
 }
 
@@ -1005 +1004 @@
   struct SContact scon = GetContactFromArg(&sz);
 
-  if (!scon.szId && scon.nPPID != (unsigned long)-1)
+  if (scon.szId.empty() && scon.nPPID != (unsigned long)-1)
     winMain->wprintf("%CYou must specify a user to view history.\n", COLOR_RED);
   else if (scon.nPPID != (unsigned long)-1)
-    UserCommand_History(scon.szId, scon.nPPID, sz);
+    UserCommand_History(scon.szId.c_str(), scon.nPPID, sz);
 }
 

trunk/console/src/console_print.cpp

@@ -149 +149 @@
     strcpy(szMsgStr, "No Messages");
 
-  if (winMain->sLastContact.szId != 0)
-  {
-    ICQUser *u = gUserManager.FetchUser(winMain->sLastContact.szId,
+  if (!winMain->sLastContact.szId.empty())
+  {
+    ICQUser* u = gUserManager.FetchUser(winMain->sLastContact.szId.c_str(),
       winMain->sLastContact.nPPID, LOCK_R);
     if (u == NULL)
@@ -466 +466 @@
  * CLicqConsole::PrintContactPopup
  *-------------------------------------------------------------------------*/
-void CLicqConsole::PrintContactPopup(char *_szAlias)
+void CLicqConsole::PrintContactPopup(const char* _szAlias)
 {
   char title[256];

trunk/console/src/window.cpp

@@ -83 +83 @@
 
   myLastId.clear();
-  sLastContact.szId = 0;
   sLastContact.nPPID = 0;
   nLastHistory = 1;
@@ -90 +89 @@
 CWindow::~CWindow()
 {
-   if (sLastContact.szId)
-     free(sLastContact.szId);
    delwin(win);
 }

trunk/console/src/window.h

@@ -38 +38 @@
 struct SContact
 {
-  char *szId;
+  std::string szId;
   unsigned long nPPID;
 };