From ba8a84216a84c5e1e02ad46f412a04728277cb36 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 6 Oct 2014 14:39:16 +0200 Subject: rename AuthDone() -> CheckAuthDone() --- apt-pkg/acquire-item.cc | 8 +++----- apt-pkg/acquire-item.h | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index 401566cfc..c90210af7 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1577,7 +1577,6 @@ pkgAcqMetaSig::~pkgAcqMetaSig() /*{{{*/ /*}}}*/ // pkgAcqMetaSig::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- -/* The only header we use is the last-modified header. */ string pkgAcqMetaSig::Custom600Headers() const { string FinalFile = _config->FindDir("Dir::State::lists"); @@ -1612,7 +1611,7 @@ void pkgAcqMetaSig::Done(string Message,unsigned long long Size, } else { - if(AuthDone(Message, RealURI) == true) + if(CheckAuthDone(Message, RealURI) == true) { std::string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); @@ -1734,7 +1733,6 @@ void pkgAcqMetaIndex::Init(std::string URIDesc, std::string ShortDesc) } // pkgAcqMetaIndex::Custom600Headers - Insert custom request headers /*{{{*/ // --------------------------------------------------------------------- -/* The only header we use is the last-modified header. */ string pkgAcqMetaIndex::Custom600Headers() const { string Final = _config->FindDir("Dir::State::lists"); @@ -1770,7 +1768,7 @@ void pkgAcqMetaIndex::Done(string Message,unsigned long long Size, /*{{{*/ } } /*}}}*/ -bool pkgAcqMetaBase::AuthDone(string Message, const string &RealURI) /*{{{*/ +bool pkgAcqMetaBase::CheckAuthDone(string Message, const string &RealURI) /*{{{*/ { // At this point, the gpgv method has succeeded, so there is a // valid signature from a key in the trusted keyring. We @@ -2121,7 +2119,7 @@ void pkgAcqMetaClearSig::Done(std::string Message,unsigned long long Size, } else { - if(AuthDone(Message, RealURI) == true) + if(CheckAuthDone(Message, RealURI) == true) { string FinalFile = _config->FindDir("Dir::State::lists"); FinalFile += URItoFileName(RealURI); diff --git a/apt-pkg/acquire-item.h b/apt-pkg/acquire-item.h index e0739dcd2..393f3a250 100644 --- a/apt-pkg/acquire-item.h +++ b/apt-pkg/acquire-item.h @@ -411,7 +411,7 @@ class pkgAcqMetaBase : public pkgAcquire::Item * \param Message The message block received from the fetch * subprocess. */ - bool AuthDone(std::string Message, const std::string &RealURI); + bool CheckAuthDone(std::string Message, const std::string &RealURI); /** \brief Check that the release file is a release file for the * correct distribution. -- cgit v1.2.3-70-g09d2