aptconfiguration.h   aptconfiguration.h 
skipping to change at line 16 skipping to change at line 16
* This class and their methods providing a layer around the usual access * This class and their methods providing a layer around the usual access
* methods with _config to ensure that settings are correct and to be able * methods with _config to ensure that settings are correct and to be able
* to set defaults without the need to recheck it in every method again. * to set defaults without the need to recheck it in every method again.
*/ */
/*}} }*/ /*}} }*/
#ifndef APT_CONFIGURATION_H #ifndef APT_CONFIGURATION_H
#define APT_CONFIGURATION_H #define APT_CONFIGURATION_H
// Include Files /*{{ {*/ // Include Files /*{{ {*/
#include <string> #include <string>
#include <vector> #include <vector>
#include <limits>
/*}} }*/ /*}} }*/
namespace APT { namespace APT {
class Configuration { /*{{ {*/ class Configuration { /*{{ {*/
public: /*{{{*/ public: /*{{{*/
/** \brief Returns a vector of usable Compression Types /** \brief Returns a vector of usable Compression Types
* *
* Files can be compressed in various ways to decrease the size of the * Files can be compressed in various ways to decrease the size of the
* download. Therefore the Acquiremethods support a few compression types * download. Therefore the Acquiremethods support a few compression types
* and some archives provide also a few different types. This optio n * and some archives provide also a few different types. This optio n
* group exists to give the user the choice to prefer one type over the * group exists to give the user the choice to prefer one type over the
skipping to change at line 97 skipping to change at line 98
std::string Name; std::string Name;
std::string Extension; std::string Extension;
std::string Binary; std::string Binary;
std::vector<std::string> CompressArgs; std::vector<std::string> CompressArgs;
std::vector<std::string> UncompressArgs; std::vector<std::string> UncompressArgs;
unsigned short Cost; unsigned short Cost;
Compressor(char const *name, char const *extension, char con st *binary, Compressor(char const *name, char const *extension, char con st *binary,
char const *compressArg, char const *uncompressAr g, char const *compressArg, char const *uncompressAr g,
unsigned short const cost); unsigned short const cost);
Compressor() {}; Compressor() : Cost(std::numeric_limits<unsigned short>::max ()) {};
}; };
/** \brief Return a vector of Compressors supported for data.tar's /** \brief Return a vector of Compressors supported for data.tar's
* *
* \param Cached saves the result so we need to calculated it only once * \param Cached saves the result so we need to calculated it only once
* this parameter should ony be used for testing purp oses. * this parameter should ony be used for testing purp oses.
* *
* \return a vector of Compressors * \return a vector of Compressors
*/ */
std::vector<Compressor> static const getCompressors(bool const Cache d = true); std::vector<Compressor> static const getCompressors(bool const Cache d = true);
 End of changes. 2 change blocks. 
1 lines changed or deleted 2 lines changed or added


 config.h   config.h 
skipping to change at line 41 skipping to change at line 41
/* Define if we have enabled pthread support */ /* Define if we have enabled pthread support */
/* #undef HAVE_PTHREAD */ /* #undef HAVE_PTHREAD */
/* If there is no socklen_t, define this for the netdb shim */ /* If there is no socklen_t, define this for the netdb shim */
/* #undef NEED_SOCKLEN_T_DEFINE */ /* #undef NEED_SOCKLEN_T_DEFINE */
/* Define the arch name string */ /* Define the arch name string */
#define COMMON_ARCH "i386" #define COMMON_ARCH "i386"
/* The version number string */ /* The version number string */
#define VERSION "0.8.15.5" #define VERSION "0.8.15.6"
/* The package name string */ /* The package name string */
#define PACKAGE "apt" #define PACKAGE "apt"
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 depcache.h   depcache.h 
skipping to change at line 393 skipping to change at line 393
return MarkAndSweep(*f.get()); return MarkAndSweep(*f.get());
else else
return false; return false;
} }
/** \name State Manipulators /** \name State Manipulators
*/ */
// @{ // @{
void MarkKeep(PkgIterator const &Pkg, bool Soft = false, void MarkKeep(PkgIterator const &Pkg, bool Soft = false,
bool FromUser = true, unsigned long Depth = 0); bool FromUser = true, unsigned long Depth = 0);
void MarkDelete(PkgIterator const &Pkg, bool Purge = false, void MarkDelete(PkgIterator const &Pkg, bool MarkPurge = false,
unsigned long Depth = 0, bool FromUser = true); unsigned long Depth = 0, bool FromUser = true);
void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true, void MarkInstall(PkgIterator const &Pkg,bool AutoInst = true,
unsigned long Depth = 0, bool FromUser = true, unsigned long Depth = 0, bool FromUser = true,
bool ForceImportantDeps = false); bool ForceImportantDeps = false);
void MarkProtected(PkgIterator const &Pkg) { PkgState[Pkg->ID].iFlags |= Protected; }; void MarkProtected(PkgIterator const &Pkg) { PkgState[Pkg->ID].iFlags |= Protected; };
void SetReInstall(PkgIterator const &Pkg,bool To); void SetReInstall(PkgIterator const &Pkg,bool To);
// FIXME: Remove the unused boolean parameter on abi break // FIXME: Remove the unused boolean parameter on abi break
void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = tru e); void SetCandidateVersion(VerIterator TargetVer, bool const &Pseudo = tru e);
bool SetCandidateRelease(pkgCache::VerIterator TargetVer, bool SetCandidateRelease(pkgCache::VerIterator TargetVer,
skipping to change at line 462 skipping to change at line 462
* results from previous checks of this package - also it should * results from previous checks of this package - also it should
* be used if the default resolver implementation is also used to * be used if the default resolver implementation is also used to
* ensure that these packages are handled like "normal" dpkg holds. * ensure that these packages are handled like "normal" dpkg holds.
* *
* The parameters are the same as in the calling MarkDelete: * The parameters are the same as in the calling MarkDelete:
* \param Pkg the package that MarkDelete wants to remove. * \param Pkg the package that MarkDelete wants to remove.
* \param Purge should we purge instead of "only" remove? * \param Purge should we purge instead of "only" remove?
* \param Depth recursive deep of this Marker call * \param Depth recursive deep of this Marker call
* \param FromUser was the remove requested by the user? * \param FromUser was the remove requested by the user?
*/ */
virtual bool IsDeleteOk(const PkgIterator &Pkg,bool Purge = false, virtual bool IsDeleteOk(const PkgIterator &Pkg,bool MarkPurge = false,
unsigned long Depth = 0, bool FromUser = true); unsigned long Depth = 0, bool FromUser = true);
// read persistent states // read persistent states
bool readStateFile(OpProgress *prog); bool readStateFile(OpProgress *prog);
bool writeStateFile(OpProgress *prog, bool InstalledOnly=true); bool writeStateFile(OpProgress *prog, bool InstalledOnly=true);
// Size queries // Size queries
inline signed long long UsrSize() {return iUsrSize;}; inline signed long long UsrSize() {return iUsrSize;};
inline unsigned long long DebSize() {return iDownloadSize;}; inline unsigned long long DebSize() {return iDownloadSize;};
inline unsigned long DelCount() {return iDelCount;}; inline unsigned long DelCount() {return iDelCount;};
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 fileutl.h   fileutl.h 
skipping to change at line 100 skipping to change at line 100
virtual ~FileFd(); virtual ~FileFd();
}; };
bool RunScripts(const char *Cnf); bool RunScripts(const char *Cnf);
bool CopyFile(FileFd &From,FileFd &To); bool CopyFile(FileFd &From,FileFd &To);
int GetLock(string File,bool Errors = true); int GetLock(string File,bool Errors = true);
bool FileExists(string File); bool FileExists(string File);
bool RealFileExists(string File); bool RealFileExists(string File);
bool DirectoryExists(string const &Path) __attrib_const; bool DirectoryExists(string const &Path) __attrib_const;
bool CreateDirectory(string const &Parent, string const &Path); bool CreateDirectory(string const &Parent, string const &Path);
time_t GetModificationTime(string const &Path);
/** \brief Ensure the existence of the given Path /** \brief Ensure the existence of the given Path
* *
* \param Parent directory of the Path directory - a trailing * \param Parent directory of the Path directory - a trailing
* /apt/ will be removed before CreateDirectory call. * /apt/ will be removed before CreateDirectory call.
* \param Path which should exist after (successful) call * \param Path which should exist after (successful) call
*/ */
bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path); bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path);
std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ex t, std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ex t,
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 pkgcachegen.h   pkgcachegen.h 
skipping to change at line 77 skipping to change at line 77
// Flag file dependencies // Flag file dependencies
bool FoundFileDeps; bool FoundFileDeps;
bool NewGroup(pkgCache::GrpIterator &Grp,const string &Name); bool NewGroup(pkgCache::GrpIterator &Grp,const string &Name);
bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const str ing &Arch); bool NewPackage(pkgCache::PkgIterator &Pkg,const string &Name, const str ing &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,
string const &Version, unsigned int const &Op, 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 string &VerStr ,unsigned long Next); unsigned long NewVersion(pkgCache::VerIterator &Ver,const string &VerStr ,unsigned long Next);
map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lan g,const MD5SumValue &md5sum,map_ptrloc Next); map_ptrloc NewDescription(pkgCache::DescIterator &Desc,const string &Lan g,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 string &S) {return WriteUniqS tring(S.c_str(),S.length());}; inline unsigned long WriteUniqString(const string &S) {return WriteUniqS tring(S.c_str(),S.length());};
void DropProgress() {Progress = 0;}; void DropProgress() {Progress = 0;};
bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index, bool SelectFile(const string &File,const string &Site,pkgIndexFile const &Index,
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 sourcelist.h   sourcelist.h 
skipping to change at line 94 skipping to change at line 94
// List accessors // List accessors
inline const_iterator begin() const {return SrcList.begin();}; inline const_iterator begin() const {return SrcList.begin();};
inline const_iterator end() const {return SrcList.end();}; inline const_iterator end() const {return SrcList.end();};
inline unsigned int size() const {return SrcList.size();}; inline unsigned int size() const {return SrcList.size();};
inline bool empty() const {return SrcList.empty();}; inline bool empty() const {return SrcList.empty();};
bool FindIndex(pkgCache::PkgFileIterator File, bool FindIndex(pkgCache::PkgFileIterator File,
pkgIndexFile *&Found) const; pkgIndexFile *&Found) const;
bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const; bool GetIndexes(pkgAcquire *Owner, bool GetAll=false) const;
// query last-modified time
time_t GetLastModifiedTime();
pkgSourceList(); pkgSourceList();
pkgSourceList(string File); pkgSourceList(string File);
~pkgSourceList(); ~pkgSourceList();
}; };
#endif #endif
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added


 tagfile.h   tagfile.h 
skipping to change at line 80 skipping to change at line 80
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;
}; };
pkgTagSection() : Section(0), Stop(0) {}; pkgTagSection() : Section(0), TagCount(0), Stop(0) {};
}; };
class pkgTagFile class pkgTagFile
{ {
FileFd &Fd; FileFd &Fd;
char *Buffer; char *Buffer;
char *Start; char *Start;
char *End; char *End;
bool Done; bool Done;
unsigned long iOffset; unsigned long iOffset;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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/