Various fixes of issues reported by static analyzers.

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

diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_users.h b/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
index da4583b1d63a3f6dac0e94bf62659f5b84c2f5a9..cbf2591555b150b313af851a0b7e98a73824a19f 100644 (file)
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_users.h
@@ -24,6 +24,9 @@
 
 #include "parser.h"
 
+#include "stg/user_conf.h"
+#include "stg/user_stat.h"
+#include "stg/common.h"
 #include "stg/resetable.h"
 
 #include <string>
@@ -32,6 +35,7 @@ class USERS;
 class USER;
 class TARIFFS;
 class ADMIN;
+class STORE;
 
 namespace STG
 {
@@ -41,15 +45,27 @@ namespace PARSER
 class GET_USERS: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(USERS & users) : m_users(users) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_USERS(admin, m_users); }
+                static void Register(REGISTRY & registry, USERS & users)
+                { registry[ToLower(tag)] = new FACTORY(users); }
+            private:
+                USERS & m_users;
+        };
+
+        static const char * tag;
+
         GET_USERS(const ADMIN & admin, USERS & users)
-            : BASE_PARSER(admin, "GetUsers"), m_users(users),
-              lastUserUpdateTime(0), lastUpdateFound(false) {}
+            : BASE_PARSER(admin, tag), m_users(users),
+              m_lastUserUpdateTime(0) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         USERS & m_users;
-        time_t lastUserUpdateTime;
-        bool lastUpdateFound;
+        time_t m_lastUserUpdateTime;
 
         void CreateAnswer();
 };
@@ -57,13 +73,26 @@ class GET_USERS: public BASE_PARSER
 class GET_USER: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(const USERS & users) : m_users(users) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new GET_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, const USERS & users)
+                { registry[ToLower(tag)] = new FACTORY(users); }
+            private:
+                const USERS & m_users;
+        };
+
+        static const char * tag;
+
         GET_USER(const ADMIN & admin, const USERS & users)
-            : BASE_PARSER(admin, "GetUser"), m_users(users) {}
+            : BASE_PARSER(admin, tag), m_users(users) {}
         int Start(void * data, const char * el, const char ** attr);
 
     private:
         const USERS & m_users;
-        std::string login;
+        std::string m_login;
 
         void CreateAnswer();
 };
@@ -71,38 +100,71 @@ class GET_USER: public BASE_PARSER
 class ADD_USER: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(USERS & users) : m_users(users) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new ADD_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, USERS & users)
+                { registry[ToLower(tag)] = new FACTORY(users); }
+            private:
+                USERS & m_users;
+        };
+
+        static const char * tag;
+
         ADD_USER(const ADMIN & admin, USERS & users)
-            : BASE_PARSER(admin, "AddUser"), m_users(users) {}
+            : BASE_PARSER(admin, tag), m_users(users) {}
         int Start(void * data, const char * el, const char ** attr);
-        int End(void * data, const char * el);
 
     private:
         USERS & m_users;
-        std::string login;
+        std::string m_login;
 
-        int CheckUserData();
         void CreateAnswer();
 };
 
 class CHG_USER: public BASE_PARSER
 {
     public:
-        CHG_USER(const ADMIN & admin, USERS & users, const TARIFFS & tariffs);
-        ~CHG_USER();
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                FACTORY(USERS & users, STORE & store, const TARIFFS & tariffs)
+                    : m_users(users), m_store(store), m_tariffs(tariffs)
+                {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHG_USER(admin, m_users, m_store, m_tariffs); }
+                static void Register(REGISTRY & registry, USERS & users, STORE & store, const TARIFFS & tariffs)
+                { registry[ToLower(tag)] = new FACTORY(users, store, tariffs); }
+            private:
+                USERS & m_users;
+                STORE & m_store;
+                const TARIFFS & m_tariffs;
+        };
+
+        static const char * tag;
+
+        CHG_USER(const ADMIN & admin, USERS & users,
+                 STORE & store, const TARIFFS & tariffs)
+            : BASE_PARSER(admin, tag),
+              m_users(users),
+              m_store(store),
+              m_tariffs(tariffs),
+              m_cashMustBeAdded(false) {}
+
         int Start(void * data, const char * el, const char ** attr);
-        int End(void * data, const char * el);
 
     private:
         USERS & m_users;
+        STORE & m_store;
         const TARIFFS & m_tariffs;
-        USER_STAT_RES * usr;
-        USER_CONF_RES * ucr;
-        RESETABLE<uint64_t> * upr;
-        RESETABLE<uint64_t> * downr;
-        std::string cashMsg;
-        std::string login;
-        bool cashMustBeAdded;
-        int res;
+        USER_STAT_RES m_usr;
+        USER_CONF_RES m_ucr;
+        RESETABLE<uint64_t> m_upr[DIR_NUM];
+        RESETABLE<uint64_t> m_downr[DIR_NUM];
+        std::string m_cashMsg;
+        std::string m_login;
+        bool m_cashMustBeAdded;
 
         int ApplyChanges();
         void CreateAnswer();
@@ -111,8 +173,21 @@ class CHG_USER: public BASE_PARSER
 class DEL_USER: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(USERS & users) : m_users(users) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new DEL_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, USERS & users)
+                { registry[ToLower(tag)] = new FACTORY(users); }
+            private:
+                USERS & m_users;
+        };
+
+        static const char * tag;
+
         DEL_USER(const ADMIN & admin, USERS & users)
-            : BASE_PARSER(admin, "DelUser"), m_users(users), res(0), u(NULL) {}
+            : BASE_PARSER(admin, tag), m_users(users), res(0), u(NULL) {}
         int Start(void * data, const char * el, const char ** attr);
         int End(void * data, const char * el);
 
@@ -127,8 +202,21 @@ class DEL_USER: public BASE_PARSER
 class CHECK_USER: public BASE_PARSER
 {
     public:
+        class FACTORY : public BASE_PARSER::FACTORY
+        {
+            public:
+                explicit FACTORY(const USERS & users) : m_users(users) {}
+                virtual BASE_PARSER * create(const ADMIN & admin) { return new CHECK_USER(admin, m_users); }
+                static void Register(REGISTRY & registry, const USERS & users)
+                { registry[ToLower(tag)] = new FACTORY(users); }
+            private:
+                const USERS & m_users;
+        };
+
+        static const char * tag;
+
         CHECK_USER(const ADMIN & admin, const USERS & users)
-            : BASE_PARSER(admin, "CheckUser"), m_users(users) {}
+            : BASE_PARSER(admin, tag), m_users(users) {}
         int Start(void * data, const char * el, const char ** attr);
         int End(void * data, const char * el);
 
@@ -136,9 +224,10 @@ class CHECK_USER: public BASE_PARSER
         const USERS & m_users;
 
         void CreateAnswer(const char * error);
+        void CreateAnswer() {} // dummy
 };
 
-}
-}
+} // namespace PARSER
+} // namespace STG
 
 #endif