Minor changes.

diff --git a/projects/sgconf/common_sg.cpp b/projects/sgconf/common_sg.cpp
index ca1aa50c0b5f5aabda5374478949dbb0ec0574d2..38520c52dead984e76a8ae55f6c7ec5a0231b35d 100644 (file)
--- a/projects/sgconf/common_sg.cpp
+++ b/projects/sgconf/common_sg.cpp
@@ -434,8 +434,8 @@ GetUserData cbdata(request, false);
 int res = 0;
 if (isMessage)
     {
 int res = 0;
 if (isMessage)
     {

-    sc.SetSendMessageCb(RecvSetUserAnswer, &cbdata);
-    res = sc.MsgUser(str.c_str());
+    sc.SetSendMessageCallback(RecvSetUserAnswer, &cbdata);
+    res = sc.SendMessage(str.c_str());

     }
 else
     {
     }
 else
     {

diff --git a/stglibs/srvconf.lib/servconf.cpp b/stglibs/srvconf.lib/servconf.cpp
index d48424e0de2452b801322bab0c80f5e60da89a51..f2498ef50991de79fd5a9fbab940e1739d41a2fc 100644 (file)
--- a/stglibs/srvconf.lib/servconf.cpp
+++ b/stglibs/srvconf.lib/servconf.cpp
@@ -18,12 +18,6 @@
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

- /*
- $Revision: 1.8 $
- $Date: 2010/08/04 00:40:38 $
- $Author: faust $
- */
-

 #include "stg/servconf.h"
 
 #include "stg/common.h"
 #include "stg/servconf.h"
 
 #include "stg/common.h"


@@ -31,10 +25,8 @@
 #include <cstdio>
 #include <cstring>
 
 #include <cstdio>
 #include <cstring>
 

-using namespace std;
-

 //-----------------------------------------------------------------------------
 //-----------------------------------------------------------------------------

-int AnsRecv(void * data, list<string> * list1)
+int AnsRecv(void * data, std::list<std::string> * list1)

 {
 SERVCONF * sc = static_cast<SERVCONF *>(data);
 
 {
 SERVCONF * sc = static_cast<SERVCONF *>(data);
 


@@ -46,7 +38,7 @@ char ans[ENC_MSG_LEN + 1];
 int len, done = 0;
 
 //loop parsing
 int len, done = 0;
 
 //loop parsing

-list<string>::iterator node;
+std::list<std::string>::iterator node;

 node = list1->begin();
 
 while (node != list1->end())
 node = list1->begin();
 
 while (node != list1->end())


@@ -64,7 +56,6 @@ while (node != list1->end())
         return st_xml_parse_error;
         }
     ++node;
         return st_xml_parse_error;
         }
     ++node;

-

     }
 
 return st_ok;
     }
 
 return st_ok;


@@ -72,22 +63,18 @@ return st_ok;
 //-----------------------------------------------------------------------------
 void Start(void *data, const char *el, const char **attr)
 {
 //-----------------------------------------------------------------------------
 void Start(void *data, const char *el, const char **attr)
 {

-SERVCONF * sc;
-sc = (SERVCONF*)data;
+SERVCONF * sc = static_cast<SERVCONF *>(data);

 sc->Start(el, attr);
 }
 //-----------------------------------------------------------------------------
 sc->Start(el, attr);
 }
 //-----------------------------------------------------------------------------

-void End(void *data, const char *el)
+void End(void * data, const char * el)

 {
 {

-SERVCONF * sc;
-sc = (SERVCONF*)data;
+SERVCONF * sc = static_cast<SERVCONF *>(data);

 sc->End(el);
 }
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()
 sc->End(el);
 }
 //-----------------------------------------------------------------------------
 SERVCONF::SERVCONF()

-    : currParser(NULL),
-      RecvSendMessageCb(NULL),
-      sendMessageDataCb(NULL)
+    : currParser(NULL)

 {
 parser = XML_ParserCreate(NULL);
 nt.SetRxCallback(this, AnsRecv);
 {
 parser = XML_ParserCreate(NULL);
 nt.SetRxCallback(this, AnsRecv);