Merge remote-tracking branch 'origin/master' into ticket

[stg.git] / stglibs / srvconf.lib / parsers / chg_service.cpp

diff --git a/stglibs/srvconf.lib/parsers/chg_service.cpp b/stglibs/srvconf.lib/parsers/chg_service.cpp
index eabe11df43f231af0f92df5511859481a266c1d0..6bea75653c9143da9ed90069fd44f86da5724061 100644 (file)
--- a/stglibs/srvconf.lib/parsers/chg_service.cpp
+++ b/stglibs/srvconf.lib/parsers/chg_service.cpp
@@ -29,14 +29,14 @@
 
 using namespace STG;
 
 
 using namespace STG;
 

-std::string CHG_SERVICE::Serialize(const SERVICE_CONF_RES & conf, const std::string & encoding)
+std::string CHG_SERVICE::Serialize(const SERVICE_CONF_RES & conf, const std::string & /*encoding*/)

 {
 std::ostringstream stream;
 
 {
 std::ostringstream stream;
 

-appendResetable(stream, "name", conf.name);
-appendResetable(stream, "comment", MaybeIconv(conf.comment, "koi8-ru", encoding));
-appendResetable(stream, "cost", conf.cost);
-appendResetable(stream, "payDay", conf.payDay);
+appendResetableAttr(stream, "name", conf.name);
+appendResetableAttr(stream, "comment", MaybeEncode(conf.comment));
+appendResetableAttr(stream, "cost", conf.cost);
+appendResetableAttr(stream, "payDay", conf.payDay);

 
 return stream.str();
 }
 
 return stream.str();
 }