Revert "Merge remote-tracking branch 'origin/master' into ticket37"

[stg.git] / stglibs / srvconf.lib / servconf.cpp

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 7b2c85ece8d11a7e5eef4983b3139deb1532fdf5..2f4afaba147bc7132d33bddfba5331197b9cb877 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -92,26 +92,29 @@ sc->End(el);
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()
     : currParser(NULL),
-      parseDepth(0),
       error(0),
       RecvUserDataCb(NULL),
       RecvGetUserDataCb(NULL),
-      authByCallback(NULL),
-      serverInfoCallback(NULL),
+      RecvServerInfoDataCb(NULL),
       RecvChgUserCb(NULL),
-      checkUserCallback(NULL),
+      RecvCheckUserCb(NULL),
       RecvSendMessageCb(NULL),
       getUserDataDataCb(NULL),
-      authByData(NULL),
+      getUserAuthByDataCb(NULL),
       getUsersDataDataCb(NULL),
-      serverInfoData(NULL),
+      getServerInfoDataCb(NULL),
       chgUserDataCb(NULL),
-      checkUserData(NULL),
+      checkUserDataCb(NULL),
       sendMessageDataCb(NULL)
 {
 parser = XML_ParserCreate(NULL);
 }
 //-----------------------------------------------------------------------------
+SERVCONF::~SERVCONF()
+{
+XML_ParserFree(parser);
+}
+//-----------------------------------------------------------------------------
 void SERVCONF::SetServer(const char * server)
 {
 nt.SetServer(server);
@@ -139,7 +142,7 @@ snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 int ret;
 
 currParser = &parserGetUser;
-((PARSER_GET_USER*)currParser)->SetCallback(getUserCallback, getUserData);
+((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -163,18 +166,18 @@ if ((ret = nt.Disconnect()) != st_ok)
 return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::AuthBy(const char * l)
+int SERVCONF::GetUserAuthBy(const char * l)
 {
 char request[255];
 snprintf(request, 255, "<GetUserAuthBy login=\"%s\"/>", l);
+int ret;
 
 currParser = &parserAuthBy;
-((PARSER_AUTH_BY*)currParser)->SetCallback(authByCallback, authByData);
+((PARSER_AUTH_BY*)currParser)->SetRecvCb(RecvAuthByCb, getUserAuthByDataCb);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
 
-int ret;
 if ((ret = nt.Connect()) != st_ok)
     {
     errorMsg = nt.GetError();
@@ -200,7 +203,7 @@ char request[] = "<GetUsers/>";
 int ret;
 
 currParser = &parserGetUsers;
-((PARSER_GET_USERS*)currParser)->SetCallback(getUsersCallback, getUsersData);
+((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -257,13 +260,13 @@ if ((ret = nt.Disconnect()) != st_ok)
 return st_ok;
 }
 //-----------------------------------------------------------------------------
-int SERVCONF::ServerInfo()
+int SERVCONF::GetServerInfo()
 {
 char request[] = "<GetServerInfo/>";
 int ret;
 
 currParser = &parserServerInfo;
-((PARSER_SERVER_INFO*)currParser)->SetCallback(serverInfoCallback, serverInfoData);
+((PARSER_GET_SERVER_INFO*)currParser)->SetServerInfoRecvCb(RecvServerInfoDataCb, getServerInfoDataCb);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -354,7 +357,7 @@ snprintf(request, 255, "<CheckUser login=\"%s\" password=\"%s\"/>", login, passw
 int ret;
 
 currParser = &parserCheckUser;
-((PARSER_CHECK_USER*)currParser)->SetCallback(checkUserCallback, checkUserData);
+((PARSER_CHECK_USER*)currParser)->SetCheckUserRecvCb(RecvCheckUserCb, checkUserDataCb);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -389,28 +392,28 @@ void SERVCONF::End(const char *el)
 currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
+void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data)
 {
-getUsersCallback = f;
-getUsersData = data;
+RecvUserDataCb = f;
+getUsersDataDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)
+void SERVCONF::SetGetUserDataRecvCb(RecvUserDataCb_t f, void * data)
 {
-getUserCallback = f;
-getUserData = data;
+RecvGetUserDataCb = f;            //GET_USER
+getUserDataDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetAuthByCallback(PARSER_AUTH_BY::CALLBACK f, void * data)
+void SERVCONF::SetGetUserAuthByRecvCb(RecvAuthByDataCb_t f, void * data)
 {
-authByCallback = f;
-authByData = data;
+RecvAuthByCb = f;
+getUserAuthByDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
+void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
 {
-serverInfoCallback = f;
-serverInfoData = data;
+RecvServerInfoDataCb = f;
+getServerInfoDataCb = data;
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data)
@@ -419,10 +422,10 @@ RecvChgUserCb = f;
 chgUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
+void SERVCONF::SetCheckUserCb(RecvCheckUserCb_t f, void * data)
 {
-checkUserCallback = f;
-checkUserData = data;
+RecvCheckUserCb = f;
+checkUserDataCb = data;
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)