Factored out users' parser.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 83f087b3740728a48ead927593ec57055d0c3423..7b2c85ece8d11a7e5eef4983b3139deb1532fdf5 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -139,7 +139,7 @@ snprintf(request, 255, "<GetUser login=\"%s\"/>", l);
 int ret;
 
 currParser = &parserGetUser;
-((PARSER_GET_USER*)currParser)->SetUserDataRecvCb(RecvGetUserDataCb, getUserDataDataCb);
+((PARSER_GET_USER*)currParser)->SetCallback(getUserCallback, getUserData);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -200,7 +200,7 @@ char request[] = "<GetUsers/>";
 int ret;
 
 currParser = &parserGetUsers;
-((PARSER_GET_USERS*)currParser)->SetUserDataRecvCb(RecvUserDataCb, getUsersDataDataCb);
+((PARSER_GET_USERS*)currParser)->SetCallback(getUsersCallback, getUsersData);
 
 nt.Reset();
 nt.SetRxCallback(this, AnsRecv);
@@ -389,10 +389,10 @@ void SERVCONF::End(const char *el)
 currParser->ParseEnd(el);
 }
 //-----------------------------------------------------------------------------
-void SERVCONF::SetUserDataRecvCb(RecvUserDataCb_t f, void * data)
+void SERVCONF::SetGetUsersCallback(PARSER_GET_USERS::CALLBACK f, void * data)
 {
-RecvUserDataCb = f;
-getUsersDataDataCb = data;
+getUsersCallback = f;
+getUsersData = data;
 }
 //-----------------------------------------------------------------------------
 void SERVCONF::SetGetUserCallback(PARSER_GET_USER::CALLBACK f, void * data)