public:
IMPL(const std::string & server, uint16_t port,
const std::string & login, const std::string & password);
+ ~IMPL() { XML_ParserFree(parser); }
const std::string & GetStrError() const;
static void Start(void * data, const char * el, const char ** attr);
std::string errorMsg;
XML_Parser parser;
- static bool ParserRecv(void * data, const std::string & chunk, bool final);
- static bool SimpleRecv(void * data, const std::string & chunk, bool final);
+ static bool ParserRecv(const std::string & chunk, bool final, void * data);
+ static bool SimpleRecv(const std::string & chunk, bool final, void * data);
int ExecImpl(const std::string & request, PARSER & cp);
};
-bool SERVCONF::IMPL::ParserRecv(void * data, const std::string & chunk, bool final)
+bool SERVCONF::IMPL::ParserRecv(const std::string & chunk, bool final, void * data)
{
SERVCONF::IMPL * sc = static_cast<SERVCONF::IMPL *>(data);
return true;
}
-bool SERVCONF::IMPL::SimpleRecv(void * data, const std::string & chunk, bool /*final*/)
+bool SERVCONF::IMPL::SimpleRecv(const std::string & chunk, bool /*final*/, void * data)
{
*static_cast<std::string *>(data) += chunk;
return true;
: nt( server, port, login, password )
{
parser = XML_ParserCreate(NULL);
-nt.SetRxCallback(this, ParserRecv);
}
//-----------------------------------------------------------------------------
void SERVCONF::IMPL::Start(void * data, const char * el, const char ** attr)
errorMsg = nt.GetError();
return ret;
}
-if ((ret = nt.Transact(request.c_str())) != st_ok)
- {
- errorMsg = nt.GetError();
- return ret;
- }
-if ((ret = nt.Disconnect()) != st_ok)
+if ((ret = nt.Transact(request, ParserRecv, this)) != st_ok)
{
errorMsg = nt.GetError();
return ret;
}
+nt.Disconnect();
return st_ok;
}
-int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK f, void * data)
+int SERVCONF::IMPL::RawXML(const std::string & request, RAW_XML::CALLBACK callback, void * data)
{
-std::string response;
-nt.SetRxCallback(&response, SimpleRecv);
int ret = 0;
if ((ret = nt.Connect()) != st_ok)
{
- nt.SetRxCallback(this, ParserRecv);
errorMsg = nt.GetError();
- f(false, errorMsg, "", data);
+ callback(false, errorMsg, "", data);
return ret;
}
-if ((ret = nt.Transact(request.c_str())) != st_ok)
- {
- nt.SetRxCallback(this, ParserRecv);
- errorMsg = nt.GetError();
- f(false, errorMsg, "", data);
- return ret;
- }
-if ((ret = nt.Disconnect()) != st_ok)
+std::string response;
+if ((ret = nt.Transact(request, SimpleRecv, &response)) != st_ok)
{
- nt.SetRxCallback(this, ParserRecv);
errorMsg = nt.GetError();
- f(false, errorMsg, "", data);
+ callback(false, errorMsg, "", data);
return ret;
}
-nt.SetRxCallback(this, ParserRecv);
-f(true, "", response, data);
+
+nt.Disconnect();
+callback(true, "", response, data);
return st_ok;
}