X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/ede91934442fd804d7b818971a44e3ad795cb01f..36f332ceb538480aeaed0dfa9917e983cac77389:/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp

diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
index dee6dbb9..07c319a0 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp
@@ -46,7 +46,7 @@ if (cp->currParser)
     }
 else
     {
-    for (unsigned int i = 0; i < cp->dataParser.size(); i++)
+    for (size_t i = 0; i < cp->dataParser.size(); i++)
         {
         cp->dataParser[i]->SetAnswerList(&cp->answerList);
         cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin);
@@ -76,7 +76,7 @@ if (cp->currParser)
     }
 else
     {
-    for (unsigned int i = 0; i < cp->dataParser.size(); i++)
+    for (size_t i = 0; i < cp->dataParser.size(); i++)
         {
         if (cp->dataParser[i]->ParseEnd(data, el) == 0)
             {
@@ -87,15 +87,38 @@ else
 }
 //-----------------------------------------------------------------------------
 CONFIGPROTO::CONFIGPROTO()
-    : adminIP(0),
+    : answerList(),
+      requestList(),
+      adminIP(0),
+      adminLogin(),
       port(0),
-      nonstop(1),
+      thrReciveSendConf(),
+      nonstop(true),
       state(0),
-      currAdmin(),
+      currAdmin(NULL),
       WriteServLog(GetStgLogger()),
-      listenSocket(0),
+      listenSocket(-1),
+      parserGetServInfo(),
+      parserGetUsers(),
+      parserGetUser(),
+      parserChgUser(),
+      parserAddUser(),
+      parserDelUser(),
+      parserCheckUser(),
+      parserSendMessage(),
+      parserGetAdmins(),
+      parserAddAdmin(),
+      parserDelAdmin(),
+      parserChgAdmin(),
+      parserGetTariffs(),
+      parserAddTariff(),
+      parserDelTariff(),
+      parserChgTariff(),
       admins(NULL),
-      currParser(NULL)
+      currParser(NULL),
+      dataParser(),
+      xmlParser(),
+      errorStr()
 {
 dataParser.push_back(&parserGetServInfo);
 
@@ -157,10 +180,10 @@ while(nonstop)
     str[8] = 0;
     len = strlen(str);
 
-    n++;
+    ++n;
     if (n == requestList.end())
         done = 1;
-    n--;
+    --n;
 
     if (XML_Parse(xmlParser, (*n).c_str(), len, done) == XML_STATUS_ERROR)
         {
@@ -181,7 +204,7 @@ while(nonstop)
     if (done)
         return 0;
 
-    n++;
+    ++n;
     }
 
 return 0;
@@ -195,7 +218,7 @@ port = p;
 void CONFIGPROTO::SetAdmins(ADMINS * a)
 {
 admins = a;
-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)
     {
     dataParser[i]->SetAdmins(a);
     }
@@ -204,7 +227,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetUsers(USERS * u)
 {
-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)
     {
     dataParser[i]->SetUsers(u);
     }
@@ -213,15 +236,15 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetTariffs(TARIFFS * t)
 {
-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)
     {
     dataParser[i]->SetTariffs(t);
     }
 }
 //-----------------------------------------------------------------------------
-void CONFIGPROTO::SetStore(BASE_STORE * s)
+void CONFIGPROTO::SetStore(STORE * s)
 {
-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)
     {
     dataParser[i]->SetStore(s);
     }
@@ -229,19 +252,9 @@ for (unsigned int i = 0; i < dataParser.size(); i++)
 //-----------------------------------------------------------------------------
 void CONFIGPROTO::SetStgSettings(const SETTINGS * s)
 {
-for (unsigned int i = 0; i < dataParser.size(); i++)
+for (size_t i = 0; i < dataParser.size(); i++)
     {
     dataParser[i]->SetStgSettings(s);
     }
 }
 //-----------------------------------------------------------------------------
-const string & CONFIGPROTO::GetStrError() const
-{
-return errorStr;
-}
-//-----------------------------------------------------------------------------
-uint32_t CONFIGPROTO::GetAdminIP() const
-{
-return adminIP;
-}
-//-----------------------------------------------------------------------------