diff options
author | Michael Vogt <egon@tas> | 2006-12-07 11:28:00 +0100 |
---|---|---|
committer | Michael Vogt <egon@tas> | 2006-12-07 11:28:00 +0100 |
commit | 61ec27797e00a89dcde22877360686513d7e7a56 (patch) | |
tree | 4d87c3e86e645abfb3c47485a466b10303cc53b9 /apt-pkg | |
parent | fbf8c5ea5fed408c728b02d99d22551206975e9e (diff) |
* apt-pkg/contrib/progress.cc
- only check time on precent boundaries (seems to make a real difference
on ARM, see debian #398381)
* apt-pkg/contrib/sha256.cc:
- added #pragma interface
* apt-pkg/contrib/sha256.h:
- remove unneeded stdint.h include
* apt-pkg/vendorlist.cc:
- fix qualifier to make it build with -O0
* po/:
- make update-po
Diffstat (limited to 'apt-pkg')
-rw-r--r-- | apt-pkg/contrib/progress.cc | 3 | ||||
-rw-r--r-- | apt-pkg/contrib/sha256.cc | 6 | ||||
-rw-r--r-- | apt-pkg/contrib/sha256.h | 1 | ||||
-rw-r--r-- | apt-pkg/vendorlist.cc | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/apt-pkg/contrib/progress.cc b/apt-pkg/contrib/progress.cc index cb272e389..e3db9a45a 100644 --- a/apt-pkg/contrib/progress.cc +++ b/apt-pkg/contrib/progress.cc @@ -115,6 +115,8 @@ bool OpProgress::CheckChange(float Interval) if ((int)LastPercent == (int)Percent) return false; + + LastPercent = Percent; if (Interval == 0) return false; @@ -126,7 +128,6 @@ bool OpProgress::CheckChange(float Interval) if (Diff < Interval) return false; LastTime = Now; - LastPercent = Percent; return true; } /*}}}*/ diff --git a/apt-pkg/contrib/sha256.cc b/apt-pkg/contrib/sha256.cc index b75ce8a84..ecda3d8e8 100644 --- a/apt-pkg/contrib/sha256.cc +++ b/apt-pkg/contrib/sha256.cc @@ -18,6 +18,12 @@ * any later version. * */ + +#ifdef __GNUG__ +#pragma implementation "apt-pkg/sha256.h" +#endif + + #define SHA256_DIGEST_SIZE 32 #define SHA256_HMAC_BLOCK_SIZE 64 diff --git a/apt-pkg/contrib/sha256.h b/apt-pkg/contrib/sha256.h index 9e88f5ece..70b3ae2ad 100644 --- a/apt-pkg/contrib/sha256.h +++ b/apt-pkg/contrib/sha256.h @@ -20,7 +20,6 @@ #include <string> #include <algorithm> -#include <stdint.h> using std::string; using std::min; diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc index 72694dd75..8e5d09e8a 100644 --- a/apt-pkg/vendorlist.cc +++ b/apt-pkg/vendorlist.cc @@ -113,7 +113,7 @@ bool pkgVendorList::CreateList(Configuration& Cnf) const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint) { - for (const_iterator I = begin(); I != end(); ++I) + for (const_iterator I = VendorList.begin(); I != VendorList.end(); ++I) { if ((*I)->LookupFingerprint(Fingerprint) != "") return *I; |