Browse Source

s/st_mtime/mtime/ on our local stat structure in apt-ft...

Author: doogie
Date: 2002-11-22 07:19:51 GMT
s/st_mtime/mtime/ on our local stat structure in apt-ftparchive, to support
compliation on platforms where st_mtime is a macro.
tags/debian/0.7.21
Arch Librarian 17 years ago
parent
commit
c53766c774
3 changed files with 10 additions and 7 deletions
  1. +3
    -0
      debian/changelog
  2. +5
    -5
      ftparchive/cachedb.cc
  3. +2
    -2
      ftparchive/cachedb.h

+ 3
- 0
debian/changelog View File

@@ -71,6 +71,9 @@ apt (0.5.5) unstable; urgency=low
instead of stdout. Also, errors that occur no longer go to stdout,
but stderr. Closes: #161592
* Test for timegm in configure. Closes: #165516.
* s/st_mtime/mtime/ on our local stat structure in apt-ftparchive, to
support compliation on platforms where st_mtime is a macro. Closes:
#165518

-- Jason Gunthorpe <jgg@debian.org> Sun, 15 Sep 2002 17:16:59 -0600



+ 5
- 5
ftparchive/cachedb.cc View File

@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: cachedb.cc,v 1.3 2001/05/29 03:50:33 jgg Exp $
// $Id: cachedb.cc,v 1.4 2002/11/22 07:19:51 doogie Exp $
/* ######################################################################

CacheDB
@@ -91,16 +91,16 @@ bool CacheDB::SetFile(string FileName,struct stat St,FileFd *Fd)
// Lookup the stat info and confirm the file is unchanged
if (Get() == true)
{
if (CurStat.st_mtime != htonl(St.st_mtime))
if (CurStat.mtime != htonl(St.st_mtime))
{
CurStat.st_mtime = htonl(St.st_mtime);
CurStat.mtime = htonl(St.st_mtime);
CurStat.Flags = 0;
_error->Warning("File date has changed %s",FileName.c_str());
}
}
else
{
CurStat.st_mtime = htonl(St.st_mtime);
CurStat.mtime = htonl(St.st_mtime);
CurStat.Flags = 0;
}
CurStat.Flags = ntohl(CurStat.Flags);
@@ -225,7 +225,7 @@ bool CacheDB::Finish()
{
// Optimize away some writes.
if (CurStat.Flags == OldStat.Flags &&
CurStat.st_mtime == OldStat.st_mtime)
CurStat.mtime == OldStat.st_mtime)
return true;
// Write the stat information


+ 2
- 2
ftparchive/cachedb.h View File

@@ -1,6 +1,6 @@
// -*- mode: cpp; mode: fold -*-
// Description /*{{{*/
// $Id: cachedb.h,v 1.2 2001/02/20 07:03:18 jgg Exp $
// $Id: cachedb.h,v 1.3 2002/11/22 07:19:51 doogie Exp $
/* ######################################################################

CacheDB
@@ -69,7 +69,7 @@ class CacheDB
enum FlagList {FlControl = (1<<0),FlMD5=(1<<1),FlContents=(1<<2)};
struct StatStore
{
uint32_t st_mtime;
uint32_t mtime;
uint32_t Flags;
} CurStat;
struct StatStore OldStat;


Loading…
Cancel
Save