Rewritten util::stripIter(), which now returns pair of iterator.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/HttpResponse.cc b/src/HttpResponse.cc
index 0c879291..d346a755 100644
--- a/src/HttpResponse.cc
+++ b/src/HttpResponse.cc
@@ -309,11 +309,12 @@ bool parseMetalinkHttpLink(MetalinkHttpEntry& result, const std::string& s)
   if(last == s.end()) {
     return false;
   }
-  std::string uri = util::stripIter(first+1, last);
-  if(uri.empty()) {
+  std::pair<std::string::const_iterator,
+            std::string::const_iterator> p = util::stripIter(first+1, last);
+  if(p.first == p.second) {
     return false;
   } else {
-    result.uri = uri;
+    result.uri.assign(p.first, p.second);
   }
   last = std::find(last, s.end(), ';');
   if(last != s.end()) {