X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/8f1d13e63e83c5f590d59f6d09f2d1dae69ba526..e19d853bbf16b7ba8c58c71c1da488b9034e0fb3:/stglibs/srvconf.lib/servconf.cpp?ds=sidebyside
diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index d7df4704..9d7e35f2 100644
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -97,16 +97,16 @@ SERVCONF::SERVCONF()
RecvUserDataCb(NULL),
RecvGetUserDataCb(NULL),
authByCallback(NULL),
- RecvServerInfoDataCb(NULL),
+ serverInfoCallback(NULL),
RecvChgUserCb(NULL),
- RecvCheckUserCb(NULL),
+ checkUserCallback(NULL),
RecvSendMessageCb(NULL),
getUserDataDataCb(NULL),
authByData(NULL),
getUsersDataDataCb(NULL),
- getServerInfoDataCb(NULL),
+ serverInfoData(NULL),
chgUserDataCb(NULL),
- checkUserDataCb(NULL),
+ checkUserData(NULL),
sendMessageDataCb(NULL)
{
parser = XML_ParserCreate(NULL);
@@ -257,13 +257,13 @@ if ((ret = nt.Disconnect()) != st_ok)
return st_ok;
}
//-----------------------------------------------------------------------------
-int SERVCONF::GetServerInfo()
+int SERVCONF::ServerInfo()
{
char request[] = "";
int ret;
currParser = &parserServerInfo;
-((PARSER_GET_SERVER_INFO*)currParser)->SetServerInfoRecvCb(RecvServerInfoDataCb, getServerInfoDataCb);
+((PARSER_SERVER_INFO*)currParser)->SetCallback(serverInfoCallback, serverInfoData);
nt.Reset();
nt.SetRxCallback(this, AnsRecv);
@@ -354,7 +354,7 @@ snprintf(request, 255, "", login, passw
int ret;
currParser = &parserCheckUser;
-((PARSER_CHECK_USER*)currParser)->SetCheckUserRecvCb(RecvCheckUserCb, checkUserDataCb);
+((PARSER_CHECK_USER*)currParser)->SetCallback(checkUserCallback, checkUserData);
nt.Reset();
nt.SetRxCallback(this, AnsRecv);
@@ -407,10 +407,10 @@ authByCallback = f;
authByData = data;
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetServerInfoRecvCb(RecvServerInfoDataCb_t f, void * data)
+void SERVCONF::SetServerInfoCallback(PARSER_SERVER_INFO::CALLBACK f, void * data)
{
-RecvServerInfoDataCb = f;
-getServerInfoDataCb = data;
+serverInfoCallback = f;
+serverInfoData = data;
}
//-----------------------------------------------------------------------------
void SERVCONF::SetChgUserCb(RecvChgUserCb_t f, void * data)
@@ -419,10 +419,10 @@ RecvChgUserCb = f;
chgUserDataCb = data;
}
//-----------------------------------------------------------------------------
-void SERVCONF::SetCheckUserCb(RecvCheckUserCb_t f, void * data)
+void SERVCONF::SetCheckUserCallback(PARSER_CHECK_USER::CALLBACK f, void * data)
{
-RecvCheckUserCb = f;
-checkUserDataCb = data;
+checkUserCallback = f;
+checkUserData = data;
}
//-----------------------------------------------------------------------------
void SERVCONF::SetSendMessageCb(RecvSendMessageCb_t f, void * data)