Use uri_split instead of uri::parse where appropriate

1 files changed, 10 insertions, 1 deletions

diff --git a/src/uri.cc b/src/uri.cc
index 0f1d4c18..b922b17f 100644
--- a/src/uri.cc
+++ b/src/uri.cc
@@ -36,7 +36,6 @@
 #include "A2STR.h"
 #include "FeatureConfig.h"
 #include "util.h"
-#include "uri_split.h"
 
 namespace aria2 {
 
@@ -167,6 +166,16 @@ bool parse(UriStruct& result, const std::string& uri)
   }
 }
 
+std::string getFieldString(const uri_split_result& res, int field,
+                           const char* base)
+{
+  if(res.field_set & (1 << field)) {
+    return std::string(base + res.fields[field].off, res.fields[field].len);
+  } else {
+    return "";
+  }
+}
+
 std::string construct(const UriStruct& us)
 {
   std::string res;