fix foldmarkers in fileutl.cc

[apt.git] / apt-pkg / acquire-item.h

diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h
index 74b5de67582fa4a6d3a33acc0360569bc4139a75..18d72ca4097d4dd5a8335945bed5c1c5bc541b0f 100644 (file)
--- a/apt-pkg/acquire-item.h
+++ b/apt-pkg/acquire-item.h
@@ -328,11 +328,17 @@ struct DiffInfo {
    /** The filename of the diff. */
    std::string file;
 
    /** The filename of the diff. */
    std::string file;
 

-   /** The sha1 hash of the diff. */
-   std::string sha1;
+   /** The hashes of the diff */
+   HashStringList result_hashes;

 
 

-   /** The size of the diff. */
-   unsigned long size;
+   /** The hashes of the file after the diff is applied */
+   HashStringList patch_hashes;
+
+   /** The size of the file after the diff is applied */
+   unsigned long long result_size;
+
+   /** The size of the diff itself */
+   unsigned long long patch_size;

 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching a SubIndex         {{{
 };
                                                                        /*}}}*/
 /** \brief An item that is responsible for fetching a SubIndex         {{{


@@ -576,7 +582,7 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
     *  \return \b true if an applicable diff was found, \b false
     *  otherwise.
     */
     *  \return \b true if an applicable diff was found, \b false
     *  otherwise.
     */

-   bool QueueNextDiff();
+   APT_HIDDEN bool QueueNextDiff();

 
    /** \brief Handle tasks that must be performed after the item
     *  finishes downloading.
 
    /** \brief Handle tasks that must be performed after the item
     *  finishes downloading.


@@ -589,7 +595,7 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
     *  \param allDone If \b true, the file was entirely reconstructed,
     *  and its md5sum is verified. 
     */
     *  \param allDone If \b true, the file was entirely reconstructed,
     *  and its md5sum is verified. 
     */

-   void Finish(bool allDone=false);
+   APT_HIDDEN void Finish(bool allDone=false);

 
    protected:
 
 
    protected:
 


@@ -616,9 +622,6 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
     */
    std::vector<DiffInfo> available_patches;
 
     */
    std::vector<DiffInfo> available_patches;
 

-   /** Stop applying patches when reaching that sha1 */
-   std::string ServerSha1;
-

    /** The current status of this patch. */
    enum DiffState
      {
    /** The current status of this patch. */
    enum DiffState
      {


@@ -662,12 +665,10 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
     *
     *  \param ShortDesc A brief description of this item.
     *
     *
     *  \param ShortDesc A brief description of this item.
     *

-    *  \param ExpectedHashes The expected md5sum of the completely
+    *  \param ExpectedHashes The expected hashsums of the completely

     *  reconstructed package index file; the index file will be tested
     *  against this value when it is entirely reconstructed.
     *
     *  reconstructed package index file; the index file will be tested
     *  against this value when it is entirely reconstructed.
     *

-    *  \param ServerSha1 is the sha1sum of the current file on the server
-    *

     *  \param diffs The remaining diffs from the index of diffs.  They
     *  should be ordered so that each diff appears before any diff
     *  that depends on it.
     *  \param diffs The remaining diffs from the index of diffs.  They
     *  should be ordered so that each diff appears before any diff
     *  that depends on it.


@@ -676,7 +677,6 @@ class pkgAcqIndexDiffs : public pkgAcqBaseIndex
                     struct IndexTarget const * const Target,
                     HashStringList const &ExpectedHash,
                     indexRecords *MetaIndexParser,
                     struct IndexTarget const * const Target,
                     HashStringList const &ExpectedHash,
                     indexRecords *MetaIndexParser,

-                   std::string ServerSha1,

                    std::vector<DiffInfo> diffs=std::vector<DiffInfo>());
 };
                                                                        /*}}}*/
                    std::vector<DiffInfo> diffs=std::vector<DiffInfo>());
 };
                                                                        /*}}}*/