HCoop
/
ntk
/
apt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
support dash-escaped text in clearsigned files as implementations are
[ntk/apt.git]
/
ftparchive
/
cachedb.h
diff --git
a/ftparchive/cachedb.h
b/ftparchive/cachedb.h
index
15e7963
..
b9ced94
100644
(file)
--- a/
ftparchive/cachedb.h
+++ b/
ftparchive/cachedb.h
@@
-13,16
+13,16
@@
#define CACHEDB_H
#define CACHEDB_H
+#include <apt-pkg/debfile.h>
#include <db.h>
#include <db.h>
-#include <string>
-#include <apt-pkg/debfile.h>
#include <inttypes.h>
#include <sys/stat.h>
#include <errno.h>
#include <inttypes.h>
#include <sys/stat.h>
#include <errno.h>
-
+#include <string>
+
#include "contents.h"
#include "contents.h"
-
+
class CacheDB
{
protected:
class CacheDB
{
protected:
@@
-34,7
+34,7
@@
class CacheDB
DB *Dbp;
bool DBLoaded;
bool ReadOnly;
DB *Dbp;
bool DBLoaded;
bool ReadOnly;
- string DBFile;
+ st
d::st
ring DBFile;
// Generate a key for the DB of a given type
inline void InitQuery(const char *Type)
// Generate a key for the DB of a given type
inline void InitQuery(const char *Type)
@@
-81,7
+81,7
@@
class CacheDB
{
uint32_t Flags;
uint32_t mtime;
{
uint32_t Flags;
uint32_t mtime;
- uint
32
_t FileSize;
+ uint
64
_t FileSize;
uint8_t MD5[16];
uint8_t SHA1[20];
uint8_t SHA256[32];
uint8_t MD5[16];
uint8_t SHA1[20];
uint8_t SHA256[32];
@@
-90,7
+90,7
@@
class CacheDB
struct StatStore OldStat;
// 'set' state
struct StatStore OldStat;
// 'set' state
- string FileName;
+ st
d::st
ring FileName;
FileFd *Fd;
debDebFile *DebFile;
FileFd *Fd;
debDebFile *DebFile;
@@
-99,10
+99,10
@@
class CacheDB
// Data collection helpers
debDebFile::MemControlExtract Control;
ContentsExtract Contents;
// Data collection helpers
debDebFile::MemControlExtract Control;
ContentsExtract Contents;
- string MD5Res;
- string SHA1Res;
- string SHA256Res;
- string SHA512Res;
+ st
d::st
ring MD5Res;
+ st
d::st
ring SHA1Res;
+ st
d::st
ring SHA256Res;
+ st
d::st
ring SHA512Res;
// Runtime statistics
struct Stats
// Runtime statistics
struct Stats
@@
-114,7
+114,7
@@
class CacheDB
double SHA512Bytes;
unsigned long Packages;
unsigned long Misses;
double SHA512Bytes;
unsigned long Packages;
unsigned long Misses;
- unsigned long DeLinkBytes;
+ unsigned long
long
DeLinkBytes;
inline void Add(const Stats &S) {
Bytes += S.Bytes;
inline void Add(const Stats &S) {
Bytes += S.Bytes;
@@
-126,24
+126,25
@@
class CacheDB
Misses += S.Misses;
DeLinkBytes += S.DeLinkBytes;
};
Misses += S.Misses;
DeLinkBytes += S.DeLinkBytes;
};
- Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0), Packages(0), Misses(0), DeLinkBytes(0) {};
+ Stats() : Bytes(0), MD5Bytes(0), SHA1Bytes(0), SHA256Bytes(0),
+ SHA512Bytes(0),Packages(0), Misses(0), DeLinkBytes(0) {};
} Stats;
} Stats;
- bool ReadyDB(string const &DB);
+ bool ReadyDB(st
d::st
ring const &DB);
inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
inline bool Loaded() {return DBLoaded == true;};
inline bool DBFailed() {return Dbp != 0 && DBLoaded == false;};
inline bool Loaded() {return DBLoaded == true;};
- inline
off_t
GetFileSize(void) {return CurStat.FileSize;}
+ inline
unsigned long long
GetFileSize(void) {return CurStat.FileSize;}
- bool SetFile(string const &FileName,struct stat St,FileFd *Fd);
- bool GetFileInfo(string const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
+ bool SetFile(st
d::st
ring const &FileName,struct stat St,FileFd *Fd);
+ bool GetFileInfo(st
d::st
ring const &FileName, bool const &DoControl, bool const &DoContents, bool const &GenContentsOnly,
bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);
bool Finish();
bool Clean();
bool const &DoMD5, bool const &DoSHA1, bool const &DoSHA256, bool const &DoSHA512, bool const &checkMtime = false);
bool Finish();
bool Clean();
- CacheDB(st
ring const &DB) : Dbp(0), Fd(NULL), DebFile(0) {
ReadyDB(DB);};
- ~CacheDB() {ReadyDB(string()); delete DebFile;};
+ CacheDB(st
d::string const &DB) : Dbp(0), Fd(NULL), DebFile(0) {TmpKey[0]='\0';
ReadyDB(DB);};
+ ~CacheDB() {ReadyDB(st
d::st
ring()); delete DebFile;};
};
#endif
};
#endif