diff options
| author | Julian Andres Klode <jak@debian.org> | 2016-09-02 22:38:34 +0200 |
|---|---|---|
| committer | Julian Andres Klode <jak@debian.org> | 2016-09-02 22:38:34 +0200 |
| commit | 969d33307ae0cc1b433a0462ef1561580ea6ddbc (patch) | |
| tree | 0322cf6e3a82a1536c4516e8729993ce68af57af /apt-pkg/contrib/hashes.h | |
| parent | f6c10fb46d1193b8181b5846538e2cf7c15ff216 (diff) | |
| parent | 54dd6baaf16e92c83f63bdb3633df6e603ac19f3 (diff) | |
Merge tag '1.3_rc4' into ubuntu/master
apt Debian release 1.3~rc4
Diffstat (limited to 'apt-pkg/contrib/hashes.h')
| -rw-r--r-- | apt-pkg/contrib/hashes.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index 9bfc32c54..1fe0afc00 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -195,11 +195,11 @@ class Hashes static const int UntilEOF = 0; - bool Add(const unsigned char * const Data, unsigned long long const Size); - APT_DEPRECATED_MSG("Construct accordingly instead of choosing hashes while adding") bool Add(const unsigned char * const Data, unsigned long long const Size, unsigned int const Hashes); - inline bool Add(const char * const Data) + bool Add(const unsigned char * const Data, unsigned long long const Size) APT_NONNULL(2); + APT_DEPRECATED_MSG("Construct accordingly instead of choosing hashes while adding") bool Add(const unsigned char * const Data, unsigned long long const Size, unsigned int const Hashes) APT_NONNULL(2); + inline bool Add(const char * const Data) APT_NONNULL(2) {return Add((unsigned char const * const)Data,strlen(Data));}; - inline bool Add(const unsigned char * const Beg,const unsigned char * const End) + inline bool Add(const unsigned char * const Beg,const unsigned char * const End) APT_NONNULL(2,3) {return Add(Beg,End-Beg);}; enum SupportedHashes { MD5SUM = (1 << 0), SHA1SUM = (1 << 1), SHA256SUM = (1 << 2), |