Italian program translation update

[apt.git] / methods / rred.cc

diff --git a/methods/rred.cc b/methods/rred.cc
index fe7ef7322a40d0c08397f8501fc85e347c85889a..554ac99b4e3aed7ee22528a52917646957f8b35e 100644 (file)
--- a/methods/rred.cc
+++ b/methods/rred.cc
@@ -8,19 +8,18 @@
 #include <config.h>
 
 #include <apt-pkg/fileutl.h>
 #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 <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 <string>
 #include <list>
 #include <vector>

-#include <iterator>

 
 

-#include <fcntl.h>

 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.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
 
    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;
    {
 #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;
       for (x = changes.begin(); x != where; ++x) {
         assert(x != changes.end());
         cpos += x->offset + x->add_cnt;


@@ -469,7 +468,7 @@ class Patch {
 
    void write_diff(FILE *f)
    {
 
    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;
       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) {
         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) {
            } else if (ch->del_cnt == 1) {

-              fprintf(f, "%luc\n", line+1);
+              fprintf(f, "%lluc\n", line+1);

            } else {
            } 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;
            }
 
            mg_i = ch;


@@ -496,9 +495,9 @@ class Patch {
 
            fprintf(f, ".\n");
         } else if (ch->del_cnt == 1) {
 
            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) {
         } 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;
       }
         }
         line -= ch->offset;
       }


@@ -582,7 +581,7 @@ class RredMethod : public pkgAcqMethod {
         FILE *inp = fopen(Path.c_str(), "r");
         FILE *out = fopen(Itm->DestFile.c_str(), "w");
 
         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);
 
 
         patch.apply_against_file(out, inp, &hash);