Small refactoring in RESETABLE.

[stg.git] / projects / sgconf / common_sg.cpp

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index 06fd98237ca55fbc89c6a329ea9f76c6edaec28c..6ccd4fe5128beedef5f058c8e6652e77b1ef3a8d 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -43,6 +43,8 @@
 #include <langinfo.h>
 #include <iconv.h>
 
+using namespace STG;
+
 const int usageConf = 0;
 const int usageInfo = 1;
 
@@ -294,14 +296,7 @@ void ConvertFromKOI8(const std::string & src, std::string * dst)
 ConvertKOI8(src, dst, FROM_KOI8);
 }
 //-----------------------------------------------------------------------------
-void SendMessageCallback(bool result, const std::string & reason, void * d)
-{
-ResultData * data = static_cast<ResultData *>(d);
-data->result = result;
-data->reason = reason;
-}
-//-----------------------------------------------------------------------------
-void RecvSetUserAnswer(bool result, const std::string & reason, void * d)
+void ResultCallback(bool result, const std::string & reason, void * d)
 {
 ResultData * data = static_cast<ResultData *>(d);
 data->result = result;
@@ -309,7 +304,7 @@ data->reason = reason;
 }
 //-----------------------------------------------------------------------------
 void RecvAuthByData(bool result, const std::string & reason,
-                    const PARSER_AUTH_BY::INFO & list, void * d)
+                    const AUTH_BY::INFO & list, void * d)
 {
 ResultData * data = static_cast<ResultData *>(d);
 data->result = result;
@@ -331,7 +326,7 @@ struct StringReqParams
     const std::string * value;
 };
 //-----------------------------------------------------------------------------
-void GetUserCallback(bool result, const std::string& reason, const PARSER_GET_USER::INFO & info, void * d)
+void GetUserCallback(bool result, const std::string& reason, const GET_USER::INFO & info, void * d)
 {
 GetUserData * data = static_cast<GetUserData *>(d);
 data->result = false;
@@ -447,7 +442,7 @@ bool ProcessSetUser(const std::string & server,
 SERVCONF sc(server, port, login, password);
 
 ResultData data;
-int res = sc.ChgUser(str.c_str(), RecvSetUserAnswer, &data);
+int res = sc.ChgUser(str.c_str(), ResultCallback, &data);
 
 if (res == st_ok && data.result)
     {
@@ -470,7 +465,7 @@ bool ProcessSendMessage(const std::string & server, uint16_t port,
 SERVCONF sc(server, port, login, password);
 
 ResultData data;
-int res = sc.SendMessage(requestString.c_str(), SendMessageCallback, &data);
+int res = sc.SendMessage(requestString.c_str(), ResultCallback, &data);
 
 if (res == st_ok && data.result)
     {