From 86d4d1963a58e80642ef6e5986da54f68aa08b30 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Sat, 2 Oct 2010 08:31:28 +0000 Subject: [PATCH] 2010-10-02 Tatsuhiro Tsujikawa Code cleanup util::percentEncode() * src/util.cc --- ChangeLog | 5 +++++ src/util.cc | 11 ++++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index d34ae3e9..6320c86f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-02 Tatsuhiro Tsujikawa + + Code cleanup util::percentEncode() + * src/util.cc + 2010-10-02 Tatsuhiro Tsujikawa Made string literal static std::string in diff --git a/src/util.cc b/src/util.cc index 3ac7b13e..1bf42d4f 100644 --- a/src/util.cc +++ b/src/util.cc @@ -365,13 +365,14 @@ bool isUtf8(const std::string& str) return true; } -std::string percentEncode(const unsigned char* target, size_t len) { +std::string percentEncode(const unsigned char* target, size_t len) +{ std::string dest; for(size_t i = 0; i < len; ++i) { - if(!inRFC3986UnreservedChars(target[i])) { - dest.append(StringFormat("%%%02X", target[i]).str()); - } else { + if(inRFC3986UnreservedChars(target[i])) { dest += target[i]; + } else { + dest.append(StringFormat("%%%02X", target[i]).str()); } } return dest; @@ -380,7 +381,7 @@ std::string percentEncode(const unsigned char* target, size_t len) { std::string percentEncode(const std::string& target) { return percentEncode(reinterpret_cast(target.c_str()), - target.size()); + target.size()); } std::string torrentPercentEncode(const unsigned char* target, size_t len) {