From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sun, 20 Oct 2013 13:37:52 +0000 (+0300)
Subject: Moved common code to a single file.
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/baaffcbb18847d38ac7413c91abc361eaad8007b?ds=inline;hp=--cc

Moved common code to a single file.
---

baaffcbb18847d38ac7413c91abc361eaad8007b
diff --git a/stglibs/srvconf.lib/parsers/chg_corp.cpp b/stglibs/srvconf.lib/parsers/chg_corp.cpp
index e566e2ae..dc884220 100644
--- a/stglibs/srvconf.lib/parsers/chg_corp.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_corp.cpp
@@ -20,6 +20,8 @@
 
 #include "chg_corp.h"
 
+#include "resetable_utils.h"
+
 #include "stg/corp_conf.h"
 #include "stg/common.h"
 
@@ -27,18 +29,6 @@
 
 using namespace STG;
 
-namespace
-{
-
-template <typename T>
-void appendResetable(std::ostream & stream, const std::string & name, const T & value)
-{
-if (!value.empty())
-    stream << "<" << name << " value=\"" << value.data() << "\"/>";
-}
-
-} // namespace anonymous
-
 std::string CHG_CORP::Serialize(const CORP_CONF_RES & conf)
 {
 std::ostringstream stream;
diff --git a/stglibs/srvconf.lib/parsers/chg_service.cpp b/stglibs/srvconf.lib/parsers/chg_service.cpp
index 2eed494f..f8627614 100644
--- a/stglibs/srvconf.lib/parsers/chg_service.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_service.cpp
@@ -20,6 +20,8 @@
 
 #include "chg_service.h"
 
+#include "resetable_utils.h"
+
 #include "stg/service_conf.h"
 #include "stg/common.h"
 
@@ -27,18 +29,6 @@
 
 using namespace STG;
 
-namespace
-{
-
-template <typename T>
-void appendResetable(std::ostream & stream, const std::string & name, const T & value)
-{
-if (!value.empty())
-    stream << "<" << name << " value=\"" << value.data() << "\"/>";
-}
-
-} // namespace anonymous
-
 std::string CHG_SERVICE::Serialize(const SERVICE_CONF_RES & conf)
 {
 std::ostringstream stream;
diff --git a/stglibs/srvconf.lib/parsers/chg_tariff.cpp b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
index c23cd0cd..6735e18d 100644
--- a/stglibs/srvconf.lib/parsers/chg_tariff.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_tariff.cpp
@@ -20,6 +20,8 @@
 
 #include "chg_tariff.h"
 
+#include "resetable_utils.h"
+
 #include "stg/tariff_conf.h"
 #include "stg/common.h"
 
@@ -32,13 +34,6 @@ using namespace STG;
 namespace
 {
 
-template <typename T>
-void appendResetable(std::ostream & stream, const std::string & name, const T & value)
-{
-if (!value.empty())
-    stream << "<" << name << " value=\"" << value.data() << "\"/>";
-}
-
 template <typename A, typename T>
 void appendSlashedResetable(std::ostream & stream, const std::string & name, const A & array, T A::value_type:: * field)
 {
diff --git a/stglibs/srvconf.lib/parsers/chg_user.cpp b/stglibs/srvconf.lib/parsers/chg_user.cpp
index a9fddf15..ed2002bc 100644
--- a/stglibs/srvconf.lib/parsers/chg_user.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_user.cpp
@@ -21,6 +21,8 @@
 
 #include "chg_user.h"
 
+#include "resetable_utils.h"
+
 #include "stg/user_conf.h"
 #include "stg/user_stat.h"
 
@@ -30,25 +32,6 @@
 
 using namespace STG;
 
-namespace
-{
-
-template <typename T>
-void appendResetable(std::ostream & stream, const std::string & name, const T & value)
-{
-if (!value.empty())
-    stream << "<" << name << " value=\"" << value.data() << "\"/>";
-}
-
-template <typename T>
-void appendResetable(std::ostream & stream, const std::string & name, size_t suffix, const T & value)
-{
-if (!value.empty())
-    stream << "<" << name << suffix << " value=\"" << value.data() << "\"/>";
-}
-
-} // namespace anonymous
-
 CHG_USER::PARSER::PARSER(SIMPLE::CALLBACK f, void * d)
     : callback(f),
       data(d),
diff --git a/stglibs/srvconf.lib/parsers/resetable_utils.h b/stglibs/srvconf.lib/parsers/resetable_utils.h
new file mode 100644
index 00000000..ed1cd305
--- /dev/null
+++ b/stglibs/srvconf.lib/parsers/resetable_utils.h
@@ -0,0 +1,48 @@
+/*
+ *    This program is free software; you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation; either version 2 of the License, or
+ *    (at your option) any later version.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program; if not, write to the Free Software
+ *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+/*
+ *    Author : Maxim Mamontov <faust@stargazer.dp.ua>
+ */
+
+#ifndef __STG_STGLIBS_SRVCONF_RESETABLE_UTILS_H__
+#define __STG_STGLIBS_SRVCONF_RESETABLE_UTILS_H__
+
+#include "stg/resetable.h"
+
+#include <string>
+#include <ostream>
+
+namespace STG
+{
+
+template <typename T>
+void appendResetable(std::ostream & stream, const std::string & name, const T & value)
+{
+if (!value.empty())
+    stream << "<" << name << " value=\"" << value.data() << "\"/>";
+}
+
+template <typename T>
+void appendResetable(std::ostream & stream, const std::string & name, size_t suffix, const T & value)
+{
+if (!value.empty())
+    stream << "<" << name << suffix << " value=\"" << value.data() << "\"/>";
+}
+
+} // namespace STG
+
+#endif