Produce debug output only if SMUX_DEBUG is defined

[stg.git] / projects / stargazer / plugins / configuration / sgconfig / parser.h

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h
index 60e618cbc35a9a581ec9ee8866af8b9f36f9a040..da62dcb4ad165bc691f6bfa9a465a3eeed14d9df 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h
@@ -11,13 +11,13 @@
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

-#include "resetable.h"
-#include "stg_const.h"
-#include "store.h"
-#include "admins.h"
-#include "admin.h"
-#include "users.h"
-#include "stg_message.h"
+#include "stg/resetable.h"
+#include "stg/const.h"
+#include "stg/store.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/users.h"
+#include "stg/message.h"

 
 class TARIFFS;
 class SETTINGS;
 
 class TARIFFS;
 class SETTINGS;


@@ -31,8 +31,9 @@ public:
           tariffs(NULL),
           store(NULL),
           settings(NULL),
           tariffs(NULL),
           store(NULL),
           settings(NULL),

-          currAdmin(),
-          depth(0)
+          currAdmin(NULL),
+          depth(0),
+          answerList(NULL)

     { }
     virtual ~BASE_PARSER() {}
     virtual int ParseStart(void *data, const char *el, const char **attr) = 0;
     { }
     virtual ~BASE_PARSER() {}
     virtual int ParseStart(void *data, const char *el, const char **attr) = 0;


@@ -209,7 +210,7 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_USER: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_DEL_USER: public BASE_PARSER {
 public:

-        PARSER_DEL_USER() : BASE_PARSER(), res(0) {}
+        PARSER_DEL_USER() : BASE_PARSER(), res(0), u(NULL) {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();


@@ -231,7 +232,7 @@ private:
 //-----------------------------------------------------------------------------
 class PARSER_SEND_MESSAGE: public BASE_PARSER {
 public:
 //-----------------------------------------------------------------------------
 class PARSER_SEND_MESSAGE: public BASE_PARSER {
 public:

-        PARSER_SEND_MESSAGE() : BASE_PARSER(), result(0) {}
+        PARSER_SEND_MESSAGE() : BASE_PARSER(), result(0), u(NULL) {}

     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();
     int ParseStart(void *data, const char *el, const char **attr);
     int ParseEnd(void *data, const char *el);
     void CreateAnswer();