From 3df642f3d2537dc5531a8d91c6d85927b34b46c7 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Thu, 15 Sep 2011 12:16:25 +0300 Subject: [PATCH] Hide or add proper copy ctor and assignement operator, initialize members via initialization lists in sgconfig code --- .../configuration/sgconfig/configproto.cpp | 33 ++++++++++++--- .../configuration/sgconfig/configproto.h | 3 ++ .../plugins/configuration/sgconfig/parser.cpp | 21 ++-------- .../plugins/configuration/sgconfig/parser.h | 40 +++++++++++++------ .../configuration/sgconfig/stgconfig.cpp | 7 +++- .../configuration/sgconfig/stgconfig.h | 6 ++- 6 files changed, 73 insertions(+), 37 deletions(-) diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index 23c7d32a..07c319a0 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -87,15 +87,38 @@ else } //----------------------------------------------------------------------------- CONFIGPROTO::CONFIGPROTO() - : adminIP(0), + : answerList(), + requestList(), + adminIP(0), + adminLogin(), port(0), - nonstop(1), + thrReciveSendConf(), + nonstop(true), state(0), - currAdmin(), + currAdmin(NULL), WriteServLog(GetStgLogger()), - listenSocket(0), + listenSocket(-1), + parserGetServInfo(), + parserGetUsers(), + parserGetUser(), + parserChgUser(), + parserAddUser(), + parserDelUser(), + parserCheckUser(), + parserSendMessage(), + parserGetAdmins(), + parserAddAdmin(), + parserDelAdmin(), + parserChgAdmin(), + parserGetTariffs(), + parserAddTariff(), + parserDelTariff(), + parserChgTariff(), admins(NULL), - currParser(NULL) + currParser(NULL), + dataParser(), + xmlParser(), + errorStr() { dataParser.push_back(&parserGetServInfo); diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h index aac913f6..15809c3c 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h @@ -68,6 +68,9 @@ public: void Run(); private: + CONFIGPROTO(const CONFIGPROTO & rvalue); + CONFIGPROTO & operator=(const CONFIGPROTO & rvalue); + int RecvHdr(int sock); int RecvLogin(int sock); int SendLoginAnswer(int sock); diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp index 2a936556..c63edfe0 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.cpp @@ -94,11 +94,6 @@ answerList->push_back(""); //----------------------------------------------------------------------------- // GET USER //----------------------------------------------------------------------------- -PARSER_GET_USER::PARSER_GET_USER() -{ - -} -//----------------------------------------------------------------------------- int PARSER_GET_USER::ParseStart(void *, const char *el, const char **attr) { if (strcasecmp(el, "GetUser") == 0) @@ -296,12 +291,6 @@ answerList->push_back(s); //----------------------------------------------------------------------------- // GET USERS //----------------------------------------------------------------------------- -PARSER_GET_USERS::PARSER_GET_USERS() - : lastUserUpdateTime(0), - lastUpdateFound(false) -{ -} -//----------------------------------------------------------------------------- int PARSER_GET_USERS::ParseStart(void *, const char *el, const char ** attr) { /*if (attr && *attr && *(attr+1)) @@ -643,11 +632,6 @@ answerList->push_back(""); //----------------------------------------------------------------------------- // ADD USER //----------------------------------------------------------------------------- -PARSER_ADD_USER::PARSER_ADD_USER() -{ -depth = 0; -} -//----------------------------------------------------------------------------- int PARSER_ADD_USER::ParseStart(void *, const char *el, const char **attr) { depth++; @@ -720,10 +704,13 @@ return -1; // PARSER CHG USER //----------------------------------------------------------------------------- PARSER_CHG_USER::PARSER_CHG_USER() - : usr(NULL), + : BASE_PARSER(), + usr(NULL), ucr(NULL), upr(NULL), downr(NULL), + cashMsg(), + login(), cashMustBeAdded(false), res(0) { diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser.h b/projects/stargazer/plugins/configuration/sgconfig/parser.h index da62dcb4..df3d7155 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/parser.h +++ b/projects/stargazer/plugins/configuration/sgconfig/parser.h @@ -26,7 +26,8 @@ class SETTINGS; class BASE_PARSER { public: BASE_PARSER() - : admins(NULL), + : strError(), + admins(NULL), users(NULL), tariffs(NULL), store(NULL), @@ -34,7 +35,7 @@ public: currAdmin(NULL), depth(0), answerList(NULL) - { } + {} virtual ~BASE_PARSER() {} virtual int ParseStart(void *data, const char *el, const char **attr) = 0; virtual int ParseEnd(void *data, const char *el) = 0; @@ -50,7 +51,11 @@ public: virtual void SetCurrAdmin(ADMIN & cua) { currAdmin = &cua; } virtual std::string & GetStrError() { return strError; } virtual void Reset() { answerList->clear(); depth = 0; } + protected: + BASE_PARSER(const BASE_PARSER & rvalue); + BASE_PARSER & operator=(const BASE_PARSER & rvalue); + std::string strError; ADMINS * admins; USERS * users; @@ -71,7 +76,7 @@ public: //----------------------------------------------------------------------------- class PARSER_ADD_ADMIN: public BASE_PARSER { public: - PARSER_ADD_ADMIN() : BASE_PARSER() {} + PARSER_ADD_ADMIN() : BASE_PARSER(), adminToAdd() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -81,7 +86,7 @@ private: //----------------------------------------------------------------------------- class PARSER_DEL_ADMIN: public BASE_PARSER { public: - PARSER_DEL_ADMIN() : BASE_PARSER() {} + PARSER_DEL_ADMIN() : BASE_PARSER(), adminToDel() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -92,7 +97,7 @@ private: //----------------------------------------------------------------------------- class PARSER_CHG_ADMIN: public BASE_PARSER { public: - PARSER_CHG_ADMIN() : BASE_PARSER() {} + PARSER_CHG_ADMIN() : BASE_PARSER(), login(), password(), privAsString() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -111,8 +116,8 @@ public: //----------------------------------------------------------------------------- class PARSER_GET_USER: public BASE_PARSER { public: - PARSER_GET_USER(); - ~PARSER_GET_USER(){}; + PARSER_GET_USER() : BASE_PARSER(), login() {} + ~PARSER_GET_USER() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -122,7 +127,7 @@ private: //----------------------------------------------------------------------------- class PARSER_GET_USERS: public BASE_PARSER { public: - PARSER_GET_USERS(); + PARSER_GET_USERS() : BASE_PARSER(), lastUserUpdateTime(0), lastUpdateFound(false) {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -140,7 +145,7 @@ public: //----------------------------------------------------------------------------- class PARSER_ADD_TARIFF: public BASE_PARSER { public: - PARSER_ADD_TARIFF() : BASE_PARSER() {} + PARSER_ADD_TARIFF() : BASE_PARSER(), tariffToAdd() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -150,7 +155,7 @@ private: //----------------------------------------------------------------------------- class PARSER_DEL_TARIFF: public BASE_PARSER { public: - PARSER_DEL_TARIFF() : BASE_PARSER() {} + PARSER_DEL_TARIFF() : BASE_PARSER(), tariffToDel() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -160,7 +165,7 @@ private: //----------------------------------------------------------------------------- class PARSER_CHG_TARIFF: public BASE_PARSER { public: - PARSER_CHG_TARIFF() : BASE_PARSER() {} + PARSER_CHG_TARIFF() : BASE_PARSER(), td() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); @@ -175,7 +180,7 @@ private: //-----------------------------------------------------------------------------/ class PARSER_ADD_USER: public BASE_PARSER { public: - PARSER_ADD_USER(); + PARSER_ADD_USER() : BASE_PARSER(), login() {} ~PARSER_ADD_USER() {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); @@ -195,6 +200,9 @@ public: void CreateAnswer(); void Reset(); private: + PARSER_CHG_USER(const PARSER_CHG_USER & rvalue); + PARSER_CHG_USER & operator=(const PARSER_CHG_USER & rvalue); + std::string EncChar2String(const char *); int AplayChanges(); @@ -216,6 +224,9 @@ public: void CreateAnswer(); private: + PARSER_DEL_USER(const PARSER_DEL_USER & rvalue); + PARSER_DEL_USER & operator=(const PARSER_DEL_USER & rvalue); + int res; USER * u; }; @@ -232,11 +243,14 @@ private: //----------------------------------------------------------------------------- class PARSER_SEND_MESSAGE: public BASE_PARSER { public: - PARSER_SEND_MESSAGE() : BASE_PARSER(), result(0), u(NULL) {} + PARSER_SEND_MESSAGE() : BASE_PARSER(), logins(), result(0), msg(), u(NULL) {} int ParseStart(void *data, const char *el, const char **attr); int ParseEnd(void *data, const char *el); void CreateAnswer(); private: + PARSER_SEND_MESSAGE(const PARSER_SEND_MESSAGE & rvalue); + PARSER_SEND_MESSAGE & operator=(const PARSER_SEND_MESSAGE & rvalue); + int ParseLogins(const char * logins); enum {res_ok, res_params_error, res_unknown}; diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp index 19d68f98..f36792ae 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.cpp @@ -56,12 +56,17 @@ return "Stg configurator v.0.08"; } //----------------------------------------------------------------------------- STG_CONFIG::STG_CONFIG() - : nonstop(false), + : errorStr(), + stgConfigSettings(), + thread(), + nonstop(false), isRunning(false), + config(), users(NULL), admins(NULL), tariffs(NULL), store(NULL), + settings(), stgSettings(NULL) { } diff --git a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h index d1506ea8..9db9fd93 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h +++ b/projects/stargazer/plugins/configuration/sgconfig/stgconfig.h @@ -15,7 +15,7 @@ class STG_CONFIG; class STG_CONFIG_SETTINGS { public: - STG_CONFIG_SETTINGS() : port(0) {} + STG_CONFIG_SETTINGS() : errorStr(), port(0) {} virtual ~STG_CONFIG_SETTINGS() {} const std::string & GetStrError() const { return errorStr; } int ParseSettings(const MODULE_SETTINGS & s); @@ -49,7 +49,11 @@ public: uint16_t GetStopPosition() const { return 220; } private: + STG_CONFIG(const STG_CONFIG & rvalue); + STG_CONFIG & operator=(const STG_CONFIG & rvalue); + static void * Run(void *); + mutable std::string errorStr; STG_CONFIG_SETTINGS stgConfigSettings; pthread_t thread; -- 2.43.2