test framework: Correctly generate new paths in noopchroot

[apt.git] / apt-inst / filelist.cc

diff --git a/apt-inst/filelist.cc b/apt-inst/filelist.cc
index defc4f4df06c8f7752c2dc0c359b396e76a71dcc..a55416d6b7b2fac1e607137b9ae1cb07fe47a8ab 100644 (file)
--- a/apt-inst/filelist.cc
+++ b/apt-inst/filelist.cc
@@ -39,8 +39,6 @@
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 
 #include <apt-pkg/error.h>
 #include <apt-pkg/strutl.h>
 

-#include <stdio.h>
-#include <stdlib.h>

 #include <string.h>
 #include <iostream>
 #include <apti18n.h>
 #include <string.h>
 #include <iostream>
 #include <apti18n.h>


@@ -87,7 +85,7 @@ pkgFLCache::Header::Header()
 // FLCache::Header::CheckSizes - Check if the two headers have same *sz        /*{{{*/
 // ---------------------------------------------------------------------
 /* Compare to make sure we are matching versions */
 // FLCache::Header::CheckSizes - Check if the two headers have same *sz        /*{{{*/
 // ---------------------------------------------------------------------
 /* Compare to make sure we are matching versions */

-bool pkgFLCache::Header::CheckSizes(Header &Against) const
+APT_PURE bool pkgFLCache::Header::CheckSizes(Header &Against) const

 {
    if (HeaderSz == Against.HeaderSz &&
        NodeSz == Against.NodeSz &&
 {
    if (HeaderSz == Against.HeaderSz &&
        NodeSz == Against.NodeSz &&


@@ -355,7 +353,7 @@ pkgFLCache::NodeIterator pkgFLCache::GetNode(const char *Name,
 // ---------------------------------------------------------------------
 /* This is one of two hashing functions. The other is inlined into the
    GetNode routine. */
 // ---------------------------------------------------------------------
 /* This is one of two hashing functions. The other is inlined into the
    GetNode routine. */

-pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde)
+APT_PURE pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde)

 {
    // Hash the node
    unsigned long HashPos = 0;
 {
    // Hash the node
    unsigned long HashPos = 0;


@@ -470,7 +468,7 @@ bool pkgFLCache::AddDiversion(PkgIterator const &Owner,
    if (FromN->Pointer != 0)
       Diver = FromN->Pointer;
   
    if (FromN->Pointer != 0)
       Diver = FromN->Pointer;
   

-   /* Make sure from and to point to the same diversion, if they dont
+   /* Make sure from and to point to the same diversion, if they don't

       then we are trying to intermix diversions - very bad */
    if (ToN->Pointer != 0 && ToN->Pointer != Diver)
    {
       then we are trying to intermix diversions - very bad */
    if (ToN->Pointer != 0 && ToN->Pointer != Diver)
    {


@@ -572,7 +570,7 @@ bool pkgFLCache::AddConfFile(const char *Name,const char *NameEnd,
 // ---------------------------------------------------------------------
 /* Since the package pointer is indirected in all sorts of interesting ways
    this is used to get a pointer to the owning package */
 // ---------------------------------------------------------------------
 /* Since the package pointer is indirected in all sorts of interesting ways
    this is used to get a pointer to the owning package */

-pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const
+APT_PURE pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const

 {
    if (Nde->Pointer == 0)
       return 0;
 {
    if (Nde->Pointer == 0)
       return 0;