Use short form of util::startsWith and util::endsWith

src/AuthConfigFactory.cc

@@ -253,8 +253,7 @@ AuthConfigFactory::findBasicCred
     std::lower_bound(basicCreds_.begin(), basicCreds_.end(), bc);
   for(; i != basicCreds_.end() && (*i).host_ == host && (*i).port_ == port;
       ++i) {
-    if(util::startsWith(bc.path_.begin(), bc.path_.end(),
+    if(util::startsWith(bc.path_, (*i).path_)) {
-                        (*i).path_.begin(), (*i).path_.end())) {
       return i;
     }
   }

src/ContentTypeRequestGroupCriteria.cc

@@ -49,8 +49,7 @@ bool tailMatch
 (InputIterator first, InputIterator last, const std::string& target)
 {
   for(; first != last; ++first) {
-    if(util::endsWith(target.begin(), target.end(),
+    if(util::endsWith(target, *first)) {
-                      (*first).begin(), (*first).end())) {
       return true;
     }
   }

src/DHTMessageTrackerEntry.cc

@@ -71,13 +71,9 @@ bool DHTMessageTrackerEntry::match(const std::string& transactionID, const std::
   if(targetNode_->getIPAddress() == ipaddr) {
     return true;
   }
-  if(util::endsWith(targetNode_->getIPAddress().begin(),
+  if(util::endsWith(targetNode_->getIPAddress(), ipaddr)) {
-                    targetNode_->getIPAddress().end(),
-                    ipaddr.begin(), ipaddr.end())) {
     return targetNode_->getIPAddress() == "::ffff:"+ipaddr;
-  } else if(util::endsWith(ipaddr.begin(), ipaddr.end(),
+  } else if(util::endsWith(ipaddr, targetNode_->getIPAddress())) {
-                           targetNode_->getIPAddress().begin(),
-                           targetNode_->getIPAddress().end())) {
     return ipaddr == "::ffff:"+targetNode_->getIPAddress();
   }
   return false;

src/DownloadCommand.cc

@@ -383,10 +383,7 @@ void DownloadCommand::installStreamFilter
   streamFilter->installDelegate(streamFilter_);
   streamFilter_ = streamFilter;
   const std::string& name = streamFilter_->getName();
-  sinkFilterOnly_ =
+  sinkFilterOnly_ = util::endsWith(name, SinkStreamFilter::NAME);
-    util::endsWith(name.begin(), name.end(),
-                   SinkStreamFilter::NAME.begin(),
-                   SinkStreamFilter::NAME.end());
 }
 
 } // namespace aria2

src/HttpDownloadCommand.cc

@@ -92,10 +92,7 @@ bool HttpDownloadCommand::prepareForNextSegment() {
        (getRequest()->isKeepAliveEnabled() &&
         (
          // Make sure that all filters are finished to pool socket
-         (!util::endsWith(streamFilterName.begin(),
+         (!util::endsWith(streamFilterName, SinkStreamFilter::NAME) &&
-                          streamFilterName.end(),
-                          SinkStreamFilter::NAME.begin(),
-                          SinkStreamFilter::NAME.end()) &&
           getStreamFilter()->finished()) ||
          getRequestEndOffset() ==
          getFileEntry()->gtoloff(getSegments().front()->getPositionToWrite())

src/HttpRequest.cc

@@ -248,8 +248,7 @@ std::string HttpRequest::createRequest()
     std::vector<std::string>::const_iterator j = headers_.begin();
     std::vector<std::string>::const_iterator jend = headers_.end();
     for(; j != jend; ++j) {
-      if(util::startsWith((*j).begin(), (*j).end(),
+      if(util::startsWith(*j, (*i).first)) {
-                          (*i).first.begin(), (*i).first.end())) {
         break;
       }
     }

src/HttpSkipResponseCommand.cc

@@ -95,10 +95,7 @@ void HttpSkipResponseCommand::installStreamFilter
   streamFilter->installDelegate(streamFilter_);
   streamFilter_ = streamFilter;
   const std::string& name = streamFilter_->getName();
-  sinkFilterOnly_ =
+  sinkFilterOnly_ = util::endsWith(name, SinkStreamFilter::NAME);
-    util::endsWith(name.begin(), name.end(),
-                   SinkStreamFilter::NAME.begin(),
-                   SinkStreamFilter::NAME.end());
 }
 
 bool HttpSkipResponseCommand::executeInternal()

src/OptionHandlerImpl.cc

@@ -528,9 +528,9 @@ void HttpProxyOptionHandler::parseArg(Option& option, const std::string& optarg)
     option.put(pref_, optarg);
   } else {
     std::string uri;
-    if(util::startsWith(optarg.begin(), optarg.end(), "http://") ||
+    if(util::startsWith(optarg, "http://") ||
-       util::startsWith(optarg.begin(), optarg.end(), "https://") ||
+       util::startsWith(optarg, "https://") ||
-       util::startsWith(optarg.begin(), optarg.end(), "ftp://")) {
+       util::startsWith(optarg, "ftp://")) {
       uri = optarg;
     } else {
       uri = "http://";

src/cookie_helper.cc

@@ -373,8 +373,7 @@ std::string canonicalizeHost(const std::string& host)
 bool domainMatch(const std::string& requestHost, const std::string& domain)
 {
   return requestHost == domain ||
-    (util::endsWith(requestHost.begin(), requestHost.end(),
+    (util::endsWith(requestHost, domain) &&
-                    domain.begin(), domain.end()) &&
      requestHost[requestHost.size()-domain.size()-1] == '.' &&
      !util::isNumericHost(requestHost));
 }
@@ -382,8 +381,7 @@ bool domainMatch(const std::string& requestHost, const std::string& domain)
 bool pathMatch(const std::string& requestPath, const std::string& path)
 {
   return requestPath == path ||
-    (util::startsWith(requestPath.begin(), requestPath.end(),
+    (util::startsWith(requestPath, path) &&
-                      path.begin(), path.end()) &&
      (path[path.size()-1] == '/' || requestPath[path.size()] == '/'));
 }
 

src/util.cc

@@ -1616,6 +1616,11 @@ bool startsWith(const std::string& a, const char* b)
   return startsWith(a.begin(), a.end(), b, b+strlen(b));
 }
 
+bool startsWith(const std::string& a, const std::string& b)
+{
+  return startsWith(a.begin(), a.end(), b.begin(), b.end());
+}
+
 bool istartsWith(const std::string& a, const char* b)
 {
   return istartsWith(a.begin(), a.end(), b, b+strlen(b));

src/util.h

@@ -624,6 +624,7 @@ bool startsWith(InputIterator first, InputIterator last, const char* b)
 }
 
 bool startsWith(const std::string& a, const char* b);
+bool startsWith(const std::string& a, const std::string& b);
 
 template<typename InputIterator1, typename InputIterator2>
 bool istartsWith