X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/641204dfbdb9fc870cdd2e7f9e3169a44693e7bf..fd350a649f3454ebef042b0e6b727f3c5d18400b:/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp?ds=inline diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index 38b423fb..23c7d32a 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -41,16 +41,15 @@ CONFIGPROTO * cp = static_cast(data); if (cp->currParser) { cp->currParser->SetAnswerList(&cp->answerList); - cp->currParser->SetCurrAdmin(cp->currAdmin); + cp->currParser->SetCurrAdmin(*cp->currAdmin); cp->currParser->ParseStart(data, el, attr); } 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->currAdmin->SetAdminIP(cp->GetAdminIP()); - cp->dataParser[i]->SetCurrAdmin(cp->currAdmin); + cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin); cp->dataParser[i]->Reset(); if (cp->dataParser[i]->ParseStart(data, el, attr) == 0) { @@ -77,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) { @@ -94,13 +93,8 @@ CONFIGPROTO::CONFIGPROTO() state(0), currAdmin(), WriteServLog(GetStgLogger()), - outerSocket(0), listenSocket(0), admins(NULL), - //users(NULL), - //tariffs(NULL), - //store(NULL), - //settings(NULL), currParser(NULL) { dataParser.push_back(&parserGetServInfo); @@ -131,7 +125,6 @@ if (!xmlParser) exit(1); } -//XML_SetElementHandler(parser, ParseXMLStart, ParseXMLEnd); } //----------------------------------------------------------------------------- CONFIGPROTO::~CONFIGPROTO() @@ -164,10 +157,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) { @@ -188,7 +181,7 @@ while(nonstop) if (done) return 0; - n++; + ++n; } return 0; @@ -199,15 +192,10 @@ void CONFIGPROTO::SetPort(uint16_t p) port = p; } //----------------------------------------------------------------------------- -/*void CONFIGPROTO::SetHostAllow(HOSTALLOW *) -{ -//hostAllow = ha; -}*/ -//----------------------------------------------------------------------------- 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); } @@ -216,8 +204,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++) //----------------------------------------------------------------------------- void CONFIGPROTO::SetUsers(USERS * u) { -//users = u; -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetUsers(u); } @@ -226,17 +213,15 @@ for (unsigned int i = 0; i < dataParser.size(); i++) //----------------------------------------------------------------------------- void CONFIGPROTO::SetTariffs(TARIFFS * t) { -//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) { -//store = s; -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetStore(s); } @@ -244,56 +229,9 @@ for (unsigned int i = 0; i < dataParser.size(); i++) //----------------------------------------------------------------------------- void CONFIGPROTO::SetStgSettings(const SETTINGS * s) { -//settings = s; -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetStgSettings(s); } } //----------------------------------------------------------------------------- -/*void CONFIGPROTO::Start() -{ -finished = false; -threadExited = false; -status = starting; - -xmlParser = XML_ParserCreate(NULL); - -if (!xmlParser) - { - WriteServLog("Couldn't allocate memory for parser."); - } - -pthread_create(&thrReciveSendConf, NULL, ReciveSendConf, this); -status = started; -}*/ -//----------------------------------------------------------------------------- -/*int CONFIGPROTO::Stop() -{ -nonstop = true; -close(outerSocket); -return 0; -}*/ -//----------------------------------------------------------------------------- -/*void CONFIGPROTO::Restart() -{ -//Stop(); -//Start(); -}*/ -//----------------------------------------------------------------------------- -/*CONF_STATUS CONFIGPROTO::Status() -{ -//return status; -} -//----------------------------------------------------------------------------- -*/ -const string & CONFIGPROTO::GetStrError() -{ -return errorStr; -} -//----------------------------------------------------------------------------- -uint32_t CONFIGPROTO::GetAdminIP() -{ -return adminIP; -} -//-----------------------------------------------------------------------------