~singpolyma/biboumi

218260362f0ccb4fd5b51765d4bd331389f39baa — Florent Le Coz 8 years ago a13285d
Remove unused xml_unescape() function
2 files changed, 1 insertions(+), 46 deletions(-)

M louloulibs/xmpp/xmpp_stanza.cpp
M tests/xmpp.cpp
M louloulibs/xmpp/xmpp_stanza.cpp => louloulibs/xmpp/xmpp_stanza.cpp +0 -44
@@ 40,50 40,6 @@ std::string xml_escape(const std::string& data)
  return res;
}

std::string xml_unescape(const std::string& data)
{
  std::string res;
  res.reserve(data.size());
  const char* str = data.c_str();
  while (str && *str && static_cast<size_t>(str - data.c_str()) < data.size())
    {
      if (*str == '&')
        {
          if (strncmp(str+1, "amp;", 4) == 0)
            {
              res += "&";
              str += 4;
            }
          else if (strncmp(str+1, "lt;", 3) == 0)
            {
              res += "<";
              str += 3;
            }
          else if (strncmp(str+1, "gt;", 3) == 0)
            {
              res += ">";
              str += 3;
            }
          else if (strncmp(str+1, "quot;", 5) == 0)
            {
              res += "\"";
              str += 5;
            }
          else if (strncmp(str+1, "apos;", 5) == 0)
            {
              res += "'";
              str += 5;
            }
          else
            res += "&";
        }
      else
        res += *str;
      str++;
    }
  return res;
}

std::string sanitize(const std::string& data, const std::string& encoding)
{
  if (utils::is_valid_utf8(data.data()))

M tests/xmpp.cpp => tests/xmpp.cpp +1 -2
@@ 40,9 40,8 @@ TEST_CASE("Test basic XML parsing")
  xml.feed(doc2.data(), doc.size(), true);
}

TEST_CASE("XML escape/unescape")
TEST_CASE("XML escape")
{
  const std::string unescaped = "'coucou'<cc>/&\"gaga\"";
  CHECK(xml_escape(unescaped) == "&apos;coucou&apos;&lt;cc&gt;/&amp;&quot;gaga&quot;");
  CHECK(xml_unescape(xml_escape(unescaped)) == unescaped);
}