Changeset 6521 for trunk/licq

Timestamp:

09/13/08 22:59:51 (3 months ago)

Author:

flynd

Message:

Use strings instead of char* in onevent class so we don't need to keep track of what to deallocate.

Location:

trunk/licq

Files:

• include/licq_onevent.h (modified) (2 diffs)
• src/icqd.cpp (modified) (4 diffs)
• src/onevent.cpp (modified) (4 diffs)

trunk/licq/include/licq_onevent.h

@@ -3 +3 @@
 
 #include <pthread.h>
+#include <string>
 
 class ICQUser;
@@ -26 +27 @@
   ~COnEventManager();
 
+  const std::string command() const { return myCommand; }
+  const std::string parameter(unsigned short event) const { return myParameters[event]; }
   void Do(unsigned short m_nEvent, ICQUser *u);
-  void SetParameters(const char *, const char **);
   void SetCommandType(unsigned short _nCommandType);
+  void setCommand(const std::string& command);
+  void setParameter(unsigned short event, const std::string& parameter);
+  void setParameters(const std::string& command, const std::string parameters[]);
   unsigned short CommandType();
-  const char *Parameter(unsigned short n)  { return m_aszParameters[n]; }
-  const char *Command()  { return m_szCommand; }
   void Lock()     { pthread_mutex_lock(&mutex); }
   void Unlock()   { pthread_mutex_unlock(&mutex); }
 protected:
   unsigned short m_nCommandType;
-  char *m_szCommand;
-  char *m_aszParameters[MAX_ON_EVENT];
-  pthread_mutex_t mutex;
+  std::string myCommand;
+  std::string myParameters[MAX_ON_EVENT];
+  mutable pthread_mutex_t mutex;
 };
 

trunk/licq/src/icqd.cpp

@@ -287 +287 @@
 
   // -----OnEvent configuration-----
-  char szOnEventCommand[MAX_FILENAME_LEN], *szOnParams[MAX_ON_EVENT];
+  string onEventCommand, onEventParams[MAX_ON_EVENT];
   unsigned short nOnEventCmdType;
 
@@ -294 +294 @@
   licqConf.ReadBool("AlwaysOnlineNotify", m_bAlwaysOnlineNotify, false);
   m_xOnEventManager.SetCommandType(nOnEventCmdType);
-  for (int i = 0; i < MAX_ON_EVENT; i++) {
-    szOnParams[i] = new char[MAX_FILENAME_LEN];
-    szOnParams[i][0] = '\0';
-  }
 
   // Prepare default values for onEvent
@@ -324 +320 @@
   strncat(DEF_MSGSENT, "sounds/icq/Message.wav", MAX_APPEND);
 
-  licqConf.ReadStr("Command", szOnEventCommand, "play");
-  licqConf.ReadStr("Message", szOnParams[ON_EVENT_MSG], DEF_MESSAGE);
-  licqConf.ReadStr("Url", szOnParams[ON_EVENT_URL], DEF_URL);
-  licqConf.ReadStr("Chat", szOnParams[ON_EVENT_CHAT], DEF_CHAT);
-  licqConf.ReadStr("File", szOnParams[ON_EVENT_FILE], DEF_FILE);
-  licqConf.ReadStr("OnlineNotify", szOnParams[ON_EVENT_NOTIFY], DEF_NOTIFY);
-  licqConf.ReadStr("SysMsg", szOnParams[ON_EVENT_SYSMSG], DEF_SYSMSG);
-  licqConf.ReadStr("MsgSent", szOnParams[ON_EVENT_MSGSENT], DEF_MSGSENT);
-  m_xOnEventManager.SetParameters(szOnEventCommand, (const char **)szOnParams);
-  for (int i = 0; i < MAX_ON_EVENT; i++)
-    delete [] szOnParams[i];
+  licqConf.readString("Command", onEventCommand, "play");
+  licqConf.readString("Message", onEventParams[ON_EVENT_MSG], DEF_MESSAGE);
+  licqConf.readString("Url", onEventParams[ON_EVENT_URL], DEF_URL);
+  licqConf.readString("Chat", onEventParams[ON_EVENT_CHAT], DEF_CHAT);
+  licqConf.readString("File", onEventParams[ON_EVENT_FILE], DEF_FILE);
+  licqConf.readString("OnlineNotify", onEventParams[ON_EVENT_NOTIFY], DEF_NOTIFY);
+  licqConf.readString("SysMsg", onEventParams[ON_EVENT_SYSMSG], DEF_SYSMSG);
+  licqConf.readString("MsgSent", onEventParams[ON_EVENT_MSGSENT], DEF_MSGSENT);
+  m_xOnEventManager.setParameters(onEventCommand, onEventParams);
 
   // Statistics
@@ -843 +837 @@
   licqConf.WriteBool("AlwaysOnlineNotify", m_bAlwaysOnlineNotify);
   oem->Lock();
-  licqConf.WriteStr("Command", oem->Command());
-  licqConf.WriteStr("Message", oem->Parameter(ON_EVENT_MSG));
-  licqConf.WriteStr("Url", oem->Parameter(ON_EVENT_URL));
-  licqConf.WriteStr("Chat",oem->Parameter(ON_EVENT_CHAT));
-  licqConf.WriteStr("File",oem->Parameter(ON_EVENT_FILE));
-  licqConf.WriteStr("OnlineNotify", oem->Parameter(ON_EVENT_NOTIFY));
-  licqConf.WriteStr("SysMsg", oem->Parameter(ON_EVENT_SYSMSG));
-  licqConf.WriteStr("MsgSent", oem->Parameter(ON_EVENT_MSGSENT));
+  licqConf.writeString("Command", oem->command());
+  licqConf.writeString("Message", oem->parameter(ON_EVENT_MSG));
+  licqConf.writeString("Url", oem->parameter(ON_EVENT_URL));
+  licqConf.writeString("Chat",oem->parameter(ON_EVENT_CHAT));
+  licqConf.writeString("File",oem->parameter(ON_EVENT_FILE));
+  licqConf.writeString("OnlineNotify", oem->parameter(ON_EVENT_NOTIFY));
+  licqConf.writeString("SysMsg", oem->parameter(ON_EVENT_SYSMSG));
+  licqConf.writeString("MsgSent", oem->parameter(ON_EVENT_MSGSENT));
   oem->Unlock();
 

trunk/licq/src/onevent.cpp

@@ -18 +18 @@
 #include "support.h"
 
+using namespace std;
+
 //=====COnEventManager==========================================================
 
 COnEventManager::COnEventManager()
 {
-  m_szCommand = NULL;
-  for (unsigned short i = 0; i < MAX_ON_EVENT; i++)
-    m_aszParameters[i] = NULL;
   pthread_mutex_init(&mutex, NULL);
 }
@@ -30 +29 @@
 COnEventManager::~COnEventManager()
 {
-  if (m_szCommand)
-    free(m_szCommand);
-
-  for (unsigned short i = 0; i < MAX_ON_EVENT; i++)
-    if (m_aszParameters[i])
-      free(m_aszParameters[i]);
 }
 
@@ -53 +46 @@
 }
 
-//-----COnEventManager::SetParameters-------------------------------------------
-void COnEventManager::SetParameters(const char *_szCommand, const char **_aszParams)
+void COnEventManager::setCommand(const string& command)
 {
   pthread_mutex_lock(&mutex);
-  SetString(&m_szCommand, _szCommand);
+  myCommand = command;
+  pthread_mutex_unlock(&mutex);
+}
+
+void COnEventManager::setParameter(unsigned short event, const string& parameter)
+{
+  pthread_mutex_lock(&mutex);
+  myParameters[event] = parameter;
+  pthread_mutex_unlock(&mutex);
+}
+
+//-----COnEventManager::SetParameters-------------------------------------------
+void COnEventManager::setParameters(const string& command, const string parameters[])
+{
+  pthread_mutex_lock(&mutex);
+  myCommand = command;
   for (unsigned short i = 0; i < MAX_ON_EVENT; i++)
-    SetString(&m_aszParameters[i], _aszParams[i]);
+    myParameters[i] = parameters[i];
   pthread_mutex_unlock(&mutex);
 }
@@ -98 +105 @@
   if (m_nCommandType == ON_EVENT_RUN)
   {
-    char *szParam = m_aszParameters[_nEvent];
-    char *szFullParam;
+    string param = myParameters[_nEvent];
     if (u != NULL)
-      szFullParam = u->usprintf(szParam, USPRINTF_LINEISCMD);
-    else
-      szFullParam = strdup(szParam);
-
-    if (strlen(szFullParam))
     {
-      char szCmd[strlen(m_szCommand) + strlen(szFullParam) + 8];
-      sprintf(szCmd, "%s %s &", m_szCommand, szFullParam);
-      system(szCmd);
+      char* szFullParam = u->usprintf(param.c_str(), USPRINTF_LINEISCMD);
+      param = szFullParam;
+      free(szFullParam);
     }
-
-    if (szFullParam)
-      free(szFullParam);
+    string fullCmd = myCommand + " " + param + " &";
+    system(fullCmd.c_str());
   }
   pthread_mutex_unlock(&mutex);