← Back to branch summary

~ubuntu-branches/ubuntu/trusty/apt/trusty-security

« back to all changes in this revision

Viewing changes to apt-inst/filelist.cc

  • Committer: Package Import Robot
  • Author(s): Michael Vogt
  • Date: 2014-04-01 17:48:58 UTC
  • mfrom: (1.4.87 sid)
  • Revision ID: package-import@ubuntu.com-20140401174858-4mv29mm29zu22fn1
Tags: 1.0.1ubuntu1
https://launchpad.net/bugs/1302033
merge with the debian/sid 1.0.1 version
(LP: #1302033)

Show diffs side-by-side

added added

removed removed

Lines of Context:
apt-inst/filelist.cc
39
39
#include <apt-pkg/error.h>
40
40
#include <apt-pkg/strutl.h>
41
41
 
42
 
#include <stdio.h>
43
 
#include <stdlib.h>
44
42
#include <string.h>
45
43
#include <iostream>
46
44
#include <apti18n.h>
87
85
// FLCache::Header::CheckSizes - Check if the two headers have same *sz /*{{{*/
88
86
// ---------------------------------------------------------------------
89
87
/* Compare to make sure we are matching versions */
90
 
bool pkgFLCache::Header::CheckSizes(Header &Against) const
 
88
APT_PURE bool pkgFLCache::Header::CheckSizes(Header &Against) const
91
89
{
92
90
   if (HeaderSz == Against.HeaderSz &&
93
91
       NodeSz == Against.NodeSz &&
355
353
// ---------------------------------------------------------------------
356
354
/* This is one of two hashing functions. The other is inlined into the
357
355
   GetNode routine. */
358
 
pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde)
 
356
APT_PURE pkgFLCache::Node *pkgFLCache::HashNode(NodeIterator const &Nde)
359
357
{
360
358
   // Hash the node
361
359
   unsigned long HashPos = 0;
572
570
// ---------------------------------------------------------------------
573
571
/* Since the package pointer is indirected in all sorts of interesting ways
574
572
   this is used to get a pointer to the owning package */
575
 
pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const
 
573
APT_PURE pkgFLCache::Package *pkgFLCache::NodeIterator::RealPackage() const
576
574
{
577
575
   if (Nde->Pointer == 0)
578
576
      return 0;