aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-05-04 12:42:58 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-05-04 12:42:58 +0000
commita0e3b84fac56cad6377ecd1462058a6b29bb1ea8 (patch)
tree13d13046571c201ddc6f38f3a6e977472ce807ba
parentf92c9a0ac585d30e245c6667cbce4b035659cb11 (diff)
* Revert r15436. This was a workaround for a bug in btrfs which seems
to have been fixed now.
-rw-r--r--src/libutil/archive.cc8
-rw-r--r--src/libutil/archive.hh1
2 files changed, 0 insertions, 9 deletions
diff --git a/src/libutil/archive.cc b/src/libutil/archive.cc
index 8fde4328c..999b17cd2 100644
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -181,8 +181,6 @@ static void parseContents(ParseSink & sink, Source & source, const Path & path)
left -= n;
}
- sink.finalizeContents(size);
-
readPadding(size, source);
}
@@ -317,12 +315,6 @@ struct RestoreSink : ParseSink
writeFull(fd, data, len);
}
- void finalizeContents(unsigned long long size)
- {
- errno = ftruncate(fd, size);
- if (errno) throw SysError(format("truncating file to its allocated length of %1% bytes") % size);
- }
-
void createSymlink(const Path & path, const string & target)
{
Path p = dstPath + path;
diff --git a/src/libutil/archive.hh b/src/libutil/archive.hh
index f358a2a6b..fff620313 100644
--- a/src/libutil/archive.hh
+++ b/src/libutil/archive.hh
@@ -64,7 +64,6 @@ struct ParseSink
virtual void isExecutable() { };
virtual void preallocateContents(unsigned long long size) { };
virtual void receiveContents(unsigned char * data, unsigned int len) { };
- virtual void finalizeContents(unsigned long long size) { };
virtual void createSymlink(const Path & path, const string & target) { };
};