assert.h   assert.h 
#include <iostream> #include <iostream>
#include <cstdlib>
#define equals(x,y) assertEquals(y, x, __LINE__) #define equals(x,y) assertEquals(y, x, __LINE__)
#define equalsNot(x,y) assertEqualsNot(y, x, __LINE__) #define equalsNot(x,y) assertEqualsNot(y, x, __LINE__)
template < typename X, typename Y > template < typename X, typename Y >
void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) { void OutputAssertEqual(X expect, char const* compare, Y get, unsigned long const &line) {
std::cerr << "Test FAILED: »" << expect << "« " << compare << " » " << get << "« at line " << line << std::endl; std::cerr << "Test FAILED: »" << expect << "« " << compare << " » " << get << "« at line " << line << std::endl;
std::exit(EXIT_FAILURE);
} }
template < typename X, typename Y > template < typename X, typename Y >
void assertEquals(X expect, Y get, unsigned long const &line) { void assertEquals(X expect, Y get, unsigned long const &line) {
if (expect == get) if (expect == get)
return; return;
OutputAssertEqual(expect, "==", get, line); OutputAssertEqual(expect, "==", get, line);
} }
template < typename X, typename Y > template < typename X, typename Y >
 End of changes. 2 change blocks. 
0 lines changed or deleted 2 lines changed or added


 cacheiterators.h   cacheiterators.h 
skipping to change at line 289 skipping to change at line 289
inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owne r->PkgP + S->Package);}; inline PkgIterator TargetPkg() const {return PkgIterator(*Owner,Owne r->PkgP + S->Package);};
inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);S martTargetPkg(R);return R;}; inline PkgIterator SmartTargetPkg() const {PkgIterator R(*Owner,0);S martTargetPkg(R);return R;};
inline VerIterator ParentVer() const {return VerIterator(*Owner,Owne r->VerP + S->ParentVer);}; inline VerIterator ParentVer() const {return VerIterator(*Owner,Owne r->VerP + S->ParentVer);};
inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owne r->PkgP + Owner->VerP[S->ParentVer].ParentPkg);}; inline PkgIterator ParentPkg() const {return PkgIterator(*Owner,Owne r->PkgP + Owner->VerP[S->ParentVer].ParentPkg);};
inline bool Reverse() const {return Type == DepRev;}; inline bool Reverse() const {return Type == DepRev;};
bool IsCritical() const; bool IsCritical() const;
bool IsNegative() const; bool IsNegative() const;
bool IsIgnorable(PrvIterator const &Prv) const; bool IsIgnorable(PrvIterator const &Prv) const;
bool IsIgnorable(PkgIterator const &Pkg) const; bool IsIgnorable(PkgIterator const &Pkg) const;
bool IsMultiArchImplicit() const; bool IsMultiArchImplicit() const;
bool IsSatisfied(VerIterator const &Ver) const;
bool IsSatisfied(PrvIterator const &Prv) const;
void GlobOr(DepIterator &Start,DepIterator &End); void GlobOr(DepIterator &Start,DepIterator &End);
Version **AllTargets() const; Version **AllTargets() const;
bool SmartTargetPkg(PkgIterator &Result) const; bool SmartTargetPkg(PkgIterator &Result) const;
inline const char *CompType() const {return Owner->CompType(S->Compa reOp);}; inline const char *CompType() const {return Owner->CompType(S->Compa reOp);};
inline const char *DepType() const {return Owner->DepType(S->Type);} ; inline const char *DepType() const {return Owner->DepType(S->Type);} ;
//Nice printable representation //Nice printable representation
friend std::ostream& operator <<(std::ostream& out, DepIterator D); friend std::ostream& operator <<(std::ostream& out, DepIterator D);
inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) : inline DepIterator(pkgCache &Owner, Dependency *Trg, Version* = 0) :
 End of changes. 1 change blocks. 
0 lines changed or deleted 2 lines changed or added


 config.h   config.h 
skipping to change at line 39 skipping to change at line 39
/* Define to the size of the filesize containing structures */ /* Define to the size of the filesize containing structures */
#define _FILE_OFFSET_BITS 64 #define _FILE_OFFSET_BITS 64
/* Define the arch name string */ /* Define the arch name string */
#define COMMON_ARCH "i386" #define COMMON_ARCH "i386"
/* The package name string */ /* The package name string */
#define PACKAGE "apt" #define PACKAGE "apt"
/* The version number string */ /* The version number string */
#define PACKAGE_VERSION "0.9.7.9" #define PACKAGE_VERSION "0.9.8"
/* The mail address to reach upstream */ /* The mail address to reach upstream */
#define PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>" #define PACKAGE_MAIL "APT Development Team <deity@lists.debian.org>"
#define APT_8_CLEANER_HEADERS #define APT_8_CLEANER_HEADERS
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 indexcopy.h   indexcopy.h 
skipping to change at line 17 skipping to change at line 17
##################################################################### */ ##################################################################### */
/*}} }*/ /*}} }*/
#ifndef INDEXCOPY_H #ifndef INDEXCOPY_H
#define INDEXCOPY_H #define INDEXCOPY_H
#include <vector> #include <vector>
#include <string> #include <string>
#include <stdio.h> #include <stdio.h>
#include <apt-pkg/gpgv.h>
#include <apt-pkg/macros.h>
#ifndef APT_8_CLEANER_HEADERS #ifndef APT_8_CLEANER_HEADERS
using std::string; using std::string;
using std::vector; using std::vector;
#endif #endif
class pkgTagSection; class pkgTagSection;
class FileFd; class FileFd;
class indexRecords; class indexRecords;
class pkgCdromStatus; class pkgCdromStatus;
skipping to change at line 99 skipping to change at line 102
void *d; void *d;
bool Verify(std::string prefix,std::string file, indexRecords *records); bool Verify(std::string prefix,std::string file, indexRecords *records);
bool CopyMetaIndex(std::string CDROM, std::string CDName, bool CopyMetaIndex(std::string CDROM, std::string CDName,
std::string prefix, std::string file); std::string prefix, std::string file);
public: public:
bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::s tring> &SigList, bool CopyAndVerify(std::string CDROM,std::string Name,std::vector<std::s tring> &SigList,
std::vector<std::string> PkgList,std::vector<std::stri ng> SrcList); std::vector<std::string> PkgList,std::vector<std::stri ng> SrcList);
/** \brief generates and run the command to verify a file with gpgv */ __deprecated static bool RunGPGV(std::string const &File, std::string co
static bool RunGPGV(std::string const &File, std::string const &FileOut, nst &FileOut,
int const &statusfd, int fd[2]); int const &statusfd, int fd[2]) {
inline static bool RunGPGV(std::string const &File, std::string const &F ExecGPGV(File, FileOut, statusfd, fd);
ileOut, return false;
};
__deprecated static bool RunGPGV(std::string const &File, std::string co
nst &FileOut,
int const &statusfd = -1) { int const &statusfd = -1) {
int fd[2]; ExecGPGV(File, FileOut, statusfd);
return RunGPGV(File, FileOut, statusfd, fd); return false;
}; };
}; };
/*}} }*/ /*}} }*/
#endif #endif
 End of changes. 3 change blocks. 
7 lines changed or deleted 13 lines changed or added


 pkgcachegen.h   pkgcachegen.h 
skipping to change at line 79 skipping to change at line 79
// Flag file dependencies // Flag file dependencies
bool FoundFileDeps; bool FoundFileDeps;
bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name); bool NewGroup(pkgCache::GrpIterator &Grp,const std::string &Name);
bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, cons t std::string &Arch); bool NewPackage(pkgCache::PkgIterator &Pkg,const std::string &Name, cons t std::string &Arch);
bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List); bool NewFileVer(pkgCache::VerIterator &Ver,ListParser &List);
bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List); bool NewFileDesc(pkgCache::DescIterator &Desc,ListParser &List);
bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver, bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
std::string const &Version, unsigned int const &Op, std::string const &Version, unsigned int const &Op,
unsigned int const &Type, map_ptrloc* &OldDepLast); unsigned int const &Type, map_ptrloc* &OldDepLast);
unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &V bool NewDepends(pkgCache::PkgIterator &Pkg, pkgCache::VerIterator &Ver,
erStr,unsigned long Next); map_ptrloc const Version, unsigned int const &Op,
unsigned int const &Type, map_ptrloc* &OldDepLast);
__deprecated unsigned long NewVersion(pkgCache::VerIterator &Ver,const s
td::string &VerStr,unsigned long Next)
{ return NewVersion(Ver, VerStr, 0, 0, Next); }
unsigned long NewVersion(pkgCache::VerIterator &Ver,const std::string &V
erStr,
map_ptrloc const ParentPkg, unsigned long const
Hash,
unsigned long Next);
map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_ptrloc Next); map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const std::string &Lang,const MD5SumValue &md5sum,map_ptrloc Next);
public: public:
unsigned long WriteUniqString(const char *S,unsigned int Size); unsigned long WriteUniqString(const char *S,unsigned int Size);
inline unsigned long WriteUniqString(const std::string &S) {return Write UniqString(S.c_str(),S.length());}; inline unsigned long WriteUniqString(const std::string &S) {return Write UniqString(S.c_str(),S.length());};
void DropProgress() {Progress = 0;}; void DropProgress() {Progress = 0;};
bool SelectFile(const std::string &File,const std::string &Site,pkgIndex File const &Index, bool SelectFile(const std::string &File,const std::string &Site,pkgIndex File const &Index,
unsigned long Flags = 0); unsigned long Flags = 0);
 End of changes. 1 change blocks. 
2 lines changed or deleted 11 lines changed or added


 strutl.h   strutl.h 
skipping to change at line 36 skipping to change at line 36
#include "macros.h" #include "macros.h"
#ifndef APT_8_CLEANER_HEADERS #ifndef APT_8_CLEANER_HEADERS
using std::string; using std::string;
using std::vector; using std::vector;
using std::ostream; using std::ostream;
#endif #endif
bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::strin g *dest); bool UTF8ToCodeset(const char *codeset, const std::string &orig, std::strin g *dest);
char *_strstrip(char *String); char *_strstrip(char *String);
char *_strrstrip(char *String); // right strip only
char *_strtabexpand(char *String,size_t Len); char *_strtabexpand(char *String,size_t Len);
bool ParseQuoteWord(const char *&String,std::string &Res); bool ParseQuoteWord(const char *&String,std::string &Res);
bool ParseCWord(const char *&String,std::string &Res); bool ParseCWord(const char *&String,std::string &Res);
std::string QuoteString(const std::string &Str,const char *Bad); std::string QuoteString(const std::string &Str,const char *Bad);
std::string DeQuoteString(const std::string &Str); std::string DeQuoteString(const std::string &Str);
std::string DeQuoteString(std::string::const_iterator const &begin, std::st ring::const_iterator const &end); std::string DeQuoteString(std::string::const_iterator const &begin, std::st ring::const_iterator const &end);
// unescape (\0XX and \xXX) from a string // unescape (\0XX and \xXX) from a string
std::string DeEscapeString(const std::string &input); std::string DeEscapeString(const std::string &input);
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 tagfile.h   tagfile.h 
skipping to change at line 62 skipping to change at line 62
protected: protected:
const char *Stop; const char *Stop;
public: public:
inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs .Section;}; inline bool operator ==(const pkgTagSection &rhs) {return Section == rhs .Section;};
inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs .Section;}; inline bool operator !=(const pkgTagSection &rhs) {return Section != rhs .Section;};
bool Find(const char *Tag,const char *&Start, const char *&End) const; bool Find(const char *Tag,const char *&Start, const char *&End) const;
bool Find(const char *Tag,unsigned &Pos) const; bool Find(const char *Tag,unsigned int &Pos) const;
std::string FindS(const char *Tag) const; std::string FindS(const char *Tag) const;
signed int FindI(const char *Tag,signed long Default = 0) const ; signed int FindI(const char *Tag,signed long Default = 0) const ;
unsigned long long FindULL(const char *Tag, unsigned long long const &De fault = 0) const; unsigned long long FindULL(const char *Tag, unsigned long long const &De fault = 0) const;
bool FindFlag(const char *Tag,unsigned long &Flags, bool FindFlag(const char *Tag,unsigned long &Flags,
unsigned long Flag) const; unsigned long Flag) const;
bool static const FindFlag(unsigned long &Flags, unsigned long Flag, bool static const FindFlag(unsigned long &Flags, unsigned long Flag,
const char* Start, const char* Stop); const char* Start, const char* Stop);
bool Scan(const char *Start,unsigned long MaxLength); bool Scan(const char *Start,unsigned long MaxLength);
inline unsigned long size() const {return Stop - Section;}; inline unsigned long size() const {return Stop - Section;};
void Trim(); void Trim();
virtual void TrimRecord(bool BeforeRecord, const char* &End); virtual void TrimRecord(bool BeforeRecord, const char* &End);
inline unsigned int Count() const {return TagCount;}; inline unsigned int Count() const {return TagCount;};
inline bool Exists(const char* const Tag) {return AlphaIndexes[AlphaHash (Tag)] != 0;} bool Exists(const char* const Tag);
inline void Get(const char *&Start,const char *&Stop,unsigned int I) con st inline void Get(const char *&Start,const char *&Stop,unsigned int I) con st
{Start = Section + Indexes[I]; Stop = Section + Indexes[ I+1];} {Start = Section + Indexes[I]; Stop = Section + Indexes[ I+1];}
inline void GetSection(const char *&Start,const char *&Stop) const inline void GetSection(const char *&Start,const char *&Stop) const
{ {
Start = Section; Start = Section;
Stop = this->Stop; Stop = this->Stop;
}; };
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/