fix compiler warning in the new mirror code

diff --git a/methods/http.h b/methods/http.h
index d0677bdaa7664325d478b983dc07c16dce4adff6..0bc019e771af46fd9997f52582692ab26d6c5b72 100644 (file)
--- a/methods/http.h
+++ b/methods/http.h
@@ -13,7 +13,7 @@
 
 #define MAXLEN 360
 
 
 #define MAXLEN 360
 

-
+#include <apt-pkg/hashes.h>

 
 using std::cout;
 using std::endl;
 
 using std::cout;
 using std::endl;

diff --git a/methods/mirror.cc b/methods/mirror.cc
index b2b6b2ecf3e6692773c6a09eca4640a09ead17cd..e8873d97b099f892c5d636d44982760ecd683d0d 100644 (file)
--- a/methods/mirror.cc
+++ b/methods/mirror.cc
@@ -153,11 +153,12 @@ void MirrorMethod::CurrentQueueUriToMirror()
       return;
 
    // find current mirror and select next one
       return;
 
    // find current mirror and select next one

-   for (int i=0; i < AllMirrors.size(); i++) 
+   for (vector<string>::const_iterator mirror = AllMirrors.begin();
+       mirror != AllMirrors.end(); ++mirror)

    {
    {

-      if (Queue->Uri.find(AllMirrors[i]) == 0)
+      if (Queue->Uri.find(*mirror) == 0)

       {
       {

-        Queue->Uri.replace(0, AllMirrors[i].size(), BaseUri);
+        Queue->Uri.replace(0, mirror->length(), BaseUri);

         return;
       }
    }
         return;
       }
    }


@@ -168,15 +169,19 @@ void MirrorMethod::CurrentQueueUriToMirror()
 bool MirrorMethod::TryNextMirror()
 {
    // find current mirror and select next one
 bool MirrorMethod::TryNextMirror()
 {
    // find current mirror and select next one

-   for (int i=0; i < AllMirrors.size()-1; i++) 
+   for (vector<string>::const_iterator mirror = AllMirrors.begin();
+       mirror != AllMirrors.end(); ++mirror)

    {
    {

-      if (Queue->Uri.find(AllMirrors[i]) == 0)
-      {
-        Queue->Uri.replace(0, AllMirrors[i].size(), AllMirrors[i+1]);
-        if (Debug)
-           clog << "TryNextMirror: " << Queue->Uri << endl;
-        return true;
-      }
+      if (Queue->Uri.find(*mirror) != 0)
+        continue;
+
+      vector<string>::const_iterator nextmirror = mirror + 1;
+      if (nextmirror != AllMirrors.end())
+        break;
+      Queue->Uri.replace(0, mirror->length(), *nextmirror);
+      if (Debug)
+        clog << "TryNextMirror: " << Queue->Uri << endl;
+      return true;

    }
 
    if (Debug)
    }
 
    if (Debug)