Added setter.

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

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index 83f087b3740728a48ead927593ec57055d0c3423..7848787b61d5769cac85ff67f18c20a1107beeda 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -35,31 +35,23 @@ using namespace std;
 //-----------------------------------------------------------------------------
 int AnsRecv(void * data, list<string> * list1)
 {
-//NODE * node;
-SERVCONF * sc;
-char ans[ENC_MSG_LEN + 1];
-int len, done = 0;
-
-sc = (SERVCONF*)data;
+SERVCONF * sc = static_cast<SERVCONF *>(data);
 
 XML_ParserReset(sc->parser, NULL);
 XML_SetElementHandler(sc->parser, Start, End);
 XML_SetUserData(sc->parser, data);
 
+char ans[ENC_MSG_LEN + 1];
+int len, done = 0;
+
 //loop parsing
 list<string>::iterator node;
 node = list1->begin();
 
-if (node == list1->end())
-    {
-    return st_ok;
-    }
-
 while (node != list1->end())
     {
     strncpy(ans, node->c_str(), ENC_MSG_LEN);
     ans[ENC_MSG_LEN] = 0;
-       //printf("---> %s\n", ans);
     len = strlen(ans);
 
     if (XML_Parse(sc->parser, ans, len, done) == XML_STATUS_ERROR)
@@ -67,13 +59,14 @@ while (node != list1->end())
         strprintf(&sc->errorMsg, "XML parse error at line %d: %s",
                   static_cast<int>(XML_GetCurrentLineNumber(sc->parser)),
                   XML_ErrorString(XML_GetErrorCode(sc->parser)));
+        printf("%s\n", sc->errorMsg.c_str());
         return st_xml_parse_error;
         }
     ++node;
 
     }
 
-return 0;
+return st_ok;
 }
 //-----------------------------------------------------------------------------
 void Start(void *data, const char *el, const char **attr)
@@ -94,16 +87,16 @@ SERVCONF::SERVCONF()
     : currParser(NULL),
       parseDepth(0),
       error(0),
-      RecvUserDataCb(NULL),
-      RecvGetUserDataCb(NULL),
+      getUsersCallback(NULL),
+      getUserCallback(NULL),
       authByCallback(NULL),
       serverInfoCallback(NULL),
       RecvChgUserCb(NULL),
       checkUserCallback(NULL),
       RecvSendMessageCb(NULL),
-      getUserDataDataCb(NULL),
+      getUsersData(NULL),
+      getUserData(NULL),
       authByData(NULL),
-      getUsersDataDataCb(NULL),
       serverInfoData(NULL),
       chgUserDataCb(NULL),
       checkUserData(NULL),
@@ -139,7 +132,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 +193,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 +382,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)