- add --arch option for apt-ftparchive packages and contents commands

[apt.git] / apt-pkg / contrib / hashes.cc

diff --git a/apt-pkg/contrib/hashes.cc b/apt-pkg/contrib/hashes.cc
index 70f2db06d8eff462f4ad32758abc01fb17b76f85..985d89d903ea502c448d28aa2bb819c121d8eb64 100644 (file)
--- a/apt-pkg/contrib/hashes.cc
+++ b/apt-pkg/contrib/hashes.cc
@@ -14,9 +14,9 @@
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/hashes.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/configuration.h>

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

 #include <unistd.h>    
 #include <unistd.h>    

-#include <system.h>    

 #include <string>
 #include <iostream>
                                                                        /*}}}*/
 #include <string>
 #include <iostream>
                                                                        /*}}}*/


@@ -34,7 +34,7 @@ HashString::HashString(string Type, string Hash) : Type(Type), Hash(Hash)
 {
 }
 
 {
 }
 

-HashString::HashString(string StringedHash)
+HashString::HashString(string StringedHash)                            /*{{{*/

 {
    // legacy: md5sum without "MD5Sum:" prefix
    if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)
 {
    // legacy: md5sum without "MD5Sum:" prefix
    if (StringedHash.find(":") == string::npos && StringedHash.size() == 32)


@@ -50,9 +50,8 @@ HashString::HashString(string StringedHash)
    if(_config->FindB("Debug::Hashes",false) == true)
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }
    if(_config->FindB("Debug::Hashes",false) == true)
       std::clog << "HashString(string): " << Type << " : " << Hash << std::endl;
 }

-
-
-bool HashString::VerifyFile(string filename) const
+                                                                       /*}}}*/
+bool HashString::VerifyFile(string filename) const                     /*{{{*/

 {
    FileFd fd;
    MD5Summation MD5;
 {
    FileFd fd;
    MD5Summation MD5;


@@ -83,7 +82,7 @@ bool HashString::VerifyFile(string filename) const
 
    return (fileHash == Hash);
 }
 
    return (fileHash == Hash);
 }

-
+                                                                       /*}}}*/

 const char** HashString::SupportedHashes()
 {
    return _SupportedHashes;
 const char** HashString::SupportedHashes()
 {
    return _SupportedHashes;


@@ -94,13 +93,11 @@ bool HashString::empty() const
    return (Type.empty() || Hash.empty());
 }
 
    return (Type.empty() || Hash.empty());
 }
 

-

 string HashString::toStr() const
 {
    return Type+string(":")+Hash;
 }
 
 string HashString::toStr() const
 {
    return Type+string(":")+Hash;
 }
 

-

 // Hashes::AddFD - Add the contents of the FD                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */
 // Hashes::AddFD - Add the contents of the FD                          /*{{{*/
 // ---------------------------------------------------------------------
 /* */