Merge branch 'stg-2.409-radius'

[stg.git] / stglibs / srvconf.lib / parsers / property.h

diff --git a/stglibs/srvconf.lib/parsers/property.h b/stglibs/srvconf.lib/parsers/property.h
index df033c99d84a0fb283257e53633064811c56f16b..7aa98aebca16fbe057f798b0c942fb9fc8331ff1 100644 (file)
--- a/stglibs/srvconf.lib/parsers/property.h
+++ b/stglibs/srvconf.lib/parsers/property.h
@@ -52,14 +52,14 @@ class PROPERTY_PARSER : public BASE_PROPERTY_PARSER
 
 template <>
 inline
-bool PROPERTY_PARSER<std::string>::Parse(const char ** attr, const std::string & attrName, const std::string & fromEncoding)
+bool PROPERTY_PARSER<std::string>::Parse(const char ** attr, const std::string & attrName, const std::string & toEncoding)
 {
-if (!encoding.empty() && !fromEncoding.empty())
+if (!encoding.empty() && !toEncoding.empty())
     {
     std::string tmp;
-    if (!func(attr, value, attrName))
+    if (!func(attr, tmp, attrName))
         return false;
-    value = IconvString(tmp, fromEncoding, encoding);
+    value = IconvString(tmp, encoding, toEncoding);
     return true;
     }
 else