use pkgSrcRecords::Step() instead of Next()

diff --git a/apt-pkg/srcrecords.cc b/apt-pkg/srcrecords.cc
index f4d034b85c165f86fb2f8b3e61bf6c809c4b7424..81b1c545de7cc619ba003ea0c6e4ff6769019844 100644 (file)
--- a/apt-pkg/srcrecords.cc
+++ b/apt-pkg/srcrecords.cc
@@ -81,10 +81,10 @@ bool pkgSrcRecords::Restart()
    return true;
 }
                                                                        /*}}}*/
    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 */
 // ---------------------------------------------------------------------
 /* Step to the next source package record */

-const pkgSrcRecords::Parser* pkgSrcRecords::Next()
+const pkgSrcRecords::Parser* pkgSrcRecords::Step()

 {
    if (Current == Files.end())
       return 0;
 {
    if (Current == Files.end())
       return 0;


@@ -111,7 +111,7 @@ pkgSrcRecords::Parser *pkgSrcRecords::Find(const char *Package,bool const &SrcOn
 {
    while (true)
    {
 {
    while (true)
    {

-      if(Next() == 0)
+      if(Step() == 0)

          return 0;
 
       // IO error somehow
          return 0;
 
       // IO error somehow

diff --git a/apt-pkg/srcrecords.h b/apt-pkg/srcrecords.h
index 82460d70f2a306b0ad6059ba883ed075664c1287..e000e176ab08be193b3585d8869a8ac975bdcf69 100644 (file)
--- 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.
 
    // 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.
 
    // 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 2c81be48503099121c52e5f77a2911631794b4d3..1357f2cb04a779317b49bd6201d26b975c7eb537 100644 (file)
--- 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 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 ]
     (thanks to Helmut Grohne)
 
   [ David Kalnischkies ]