Merge remote-tracking branch 'upstream/debian/sid' into debian/sid

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index fe7ef7322a40d0c08397f8501fc85e347c85889a..cabb3c456ae923b66ba3bb87e3afcf4e378a3865 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>
@@ -469,7 +468,7 @@ class Patch {
 
    void write_diff(FILE *f)
    {
-      size_t line = 0;
+      unsigned long long line = 0;
       std::list<struct Change>::reverse_iterator ch;
       for (ch = filechanges.rbegin(); ch != filechanges.rend(); ++ch) {
         line += ch->offset + ch->del_cnt;
@@ -482,11 +481,11 @@ class Patch {
         line -= ch->del_cnt;
         if (ch->add_cnt > 0) {
            if (ch->del_cnt == 0) {
-              fprintf(f, "%lua\n", line);
+              fprintf(f, "%llua\n", line);
            } else if (ch->del_cnt == 1) {
-              fprintf(f, "%luc\n", line+1);
+              fprintf(f, "%lluc\n", line+1);
            } else {
-              fprintf(f, "%lu,%luc\n", line+1, line+ch->del_cnt);
+              fprintf(f, "%llu,%lluc\n", line+1, line+ch->del_cnt);
            }
 
            mg_i = ch;
@@ -496,9 +495,9 @@ class Patch {
 
            fprintf(f, ".\n");
         } else if (ch->del_cnt == 1) {
-           fprintf(f, "%lud\n", line+1);
+           fprintf(f, "%llud\n", line+1);
         } else if (ch->del_cnt > 1) {
-           fprintf(f, "%lu,%lud\n", line+1, line+ch->del_cnt);
+           fprintf(f, "%llu,%llud\n", line+1, line+ch->del_cnt);
         }
         line -= ch->offset;
       }