Merge branch 'debian/experimental' into feature/srv-records

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index 7169fc73130773773b50dc844d596a2bd2abcae0..554ac99b4e3aed7ee22528a52917646957f8b35e 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -8,19 +8,18 @@
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>
-#include <apt-pkg/mmap.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/acquire-method.h>
 #include <apt-pkg/strutl.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/configuration.h>
 
+#include <stddef.h>
+#include <iostream>
 #include <string>
 #include <list>
 #include <vector>
-#include <iterator>
 
-#include <fcntl.h>
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -151,11 +150,11 @@ class FileChanges {
    std::list<struct Change>::iterator where;
    size_t pos; // line number is as far left of iterator as possible
 
-   bool pos_is_okay(void)
+   bool pos_is_okay(void) const
    {
 #ifdef POSDEBUG
       size_t cpos = 0;
-      std::list<struct Change>::iterator x;
+      std::list<struct Change>::const_iterator x;
       for (x = changes.begin(); x != where; ++x) {
         assert(x != changes.end());
         cpos += x->offset + x->add_cnt;
@@ -582,7 +581,7 @@ class RredMethod : public pkgAcqMethod {
         FILE *inp = fopen(Path.c_str(), "r");
         FILE *out = fopen(Itm->DestFile.c_str(), "w");
 
-        Hashes hash;
+        Hashes hash(Itm->ExpectedHashes);
 
         patch.apply_against_file(out, inp, &hash);