From 401e5db12dd71ed84e8d17a559ff5932c1b98367 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 10 Jun 2014 15:07:15 +0200 Subject: use pkgSrcRecords::Step() instead of Next() --- apt-pkg/srcrecords.cc | 6 +++--- apt-pkg/srcrecords.h | 2 +- debian/changelog | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc index f4d034b85..81b1c545d 100644 --- a/apt-pkg/srcrecords.cc +++ b/apt-pkg/srcrecords.cc @@ -81,10 +81,10 @@ bool pkgSrcRecords::Restart() return true; } /*}}}*/ -// SrcRecords::Next - Step to the next Source Record /*{{{*/ +// SrcRecords::Step - Step to the next Source Record /*{{{*/ // --------------------------------------------------------------------- /* Step to the next source package record */ -const pkgSrcRecords::Parser* pkgSrcRecords::Next() +const pkgSrcRecords::Parser* pkgSrcRecords::Step() { if (Current == Files.end()) return 0; @@ -111,7 +111,7 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOn { while (true) { - if(Next() == 0) + if(Step() == 0) return 0; // IO error somehow diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h index 82460d70f..e000e176a 100644 --- a/apt-pkg/srcrecords.h +++ b/apt-pkg/srcrecords.h @@ -97,7 +97,7 @@ class pkgSrcRecords // Step to the next SourcePackage and return pointer to the // next SourceRecord. The pointer is owned by libapt. - const Parser* Next(); + const Parser* Step(); // Locate a package by name and return pointer to the Parser. // The pointer is owned by libapt. diff --git a/debian/changelog b/debian/changelog index 2c81be485..1357f2cb0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ apt (1.0.4) UNRELEASED; urgency=medium * Add compat mode for old (32bit FileSize) CacheDB (LP: #1274466) * cmdline/apt-helper.cc: use less generic description/short-description in apt-helper download - * add pkgSrcRecords::Next() to step through all the pkgSrcRecords + * add pkgSrcRecords::Step() to step through all the pkgSrcRecords (thanks to Helmut Grohne) [ David Kalnischkies ] -- cgit v1.2.3