#ifndef PKGLIB_TAGFILE_H
#define PKGLIB_TAGFILE_H
+#include <stdio.h>
+
+#include <string>
+#ifndef APT_8_CLEANER_HEADERS
#include <apt-pkg/fileutl.h>
-#include <stdio.h>
+#endif
+
+class FileFd;
class pkgTagSection
{
unsigned int Indexes[256];
unsigned int AlphaIndexes[0x100];
unsigned int TagCount;
- int *reserved1;
- int *reserved2;
- int *reserved3;
+ // dpointer placeholder (for later in case we need it)
+ void *d;
/* This very simple hash function for the last 8 letters gives
very good performance on the debian package files */
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,unsigned &Pos) const;
- string FindS(const char *Tag) const;
+ bool Find(const char *Tag,unsigned int &Pos) const;
+ std::string FindS(const char *Tag) const;
signed int FindI(const char *Tag,signed long Default = 0) const ;
unsigned long long FindULL(const char *Tag, unsigned long long const &Default = 0) const;
bool FindFlag(const char *Tag,unsigned long &Flags,
unsigned long Flag) const;
+ bool static const FindFlag(unsigned long &Flags, unsigned long Flag,
+ const char* Start, const char* Stop);
bool Scan(const char *Start,unsigned long MaxLength);
inline unsigned long size() const {return Stop - Section;};
void Trim();
virtual void TrimRecord(bool BeforeRecord, const char* &End);
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) const
{Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];}
Stop = this->Stop;
};
- pkgTagSection() : Section(0), Stop(0) {};
+ pkgTagSection() : Section(0), TagCount(0), Stop(0) {};
+ virtual ~pkgTagSection() {};
};
class pkgTagFilePrivate;
public:
bool Step(pkgTagSection &Section);
- inline unsigned long Offset();
- bool Jump(pkgTagSection &Tag,unsigned long Offset);
+ unsigned long Offset();
+ bool Jump(pkgTagSection &Tag,unsigned long long Offset);
- pkgTagFile(FileFd *F,unsigned long Size = 32*1024);
- ~pkgTagFile();
+ pkgTagFile(FileFd *F,unsigned long long Size = 32*1024);
+ virtual ~pkgTagFile();
};
/* This is the list of things to rewrite. The rewriter