hardcoresushi
/
libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Allow Data::FillWithZeroes on rvalue

This commit is contained in:
Sebastian Messmer 2016-07-10 22:43:07 +02:00
parent 30a1a3617e
commit 2bc3b641aa
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/cpp-utils/data/Data.h
View File

@ -30,7 +30,8 @@ public:
size_t size() const;
Data &FillWithZeroes();
Data &FillWithZeroes() &;
Data &&FillWithZeroes() &&;
void StoreToFile(const boost::filesystem::path &filepath) const;
static boost::optional<Data> LoadFromFile(const boost::filesystem::path &filepath);
@ -113,9 +114,13 @@ inline size_t Data::size() const {
return _size;
}
inline Data &Data::FillWithZeroes() {
std::memset(_data, 0, _size);
return *this;
inline Data &Data::FillWithZeroes() & {
std::memset(_data, 0, _size);
return *this;
}
inline Data &&Data::FillWithZeroes() && {
return std::move(FillWithZeroes());
}
inline void Data::StoreToFile(const boost::filesystem::path &filepath) const {

2
test/blockstore/implementations/ondisk/OnDiskBlockTest/OnDiskBlockCreateTest.cpp
View File

@ -52,7 +52,7 @@ public:
Data ZEROES;
OnDiskBlockCreateSizeTest():
block(OnDiskBlock::CreateOnDisk(dir.path(), key, std::move(Data(GetParam()).FillWithZeroes())).value()),
block(OnDiskBlock::CreateOnDisk(dir.path(), key, Data(GetParam()).FillWithZeroes()).value()),
ZEROES(block->size())
{
ZEROES.FillWithZeroes();

2
test/cpp-utils/crypto/symmetric/CipherTest.cpp
View File

@ -52,7 +52,7 @@ public:
}
static Data CreateZeroes(unsigned int size) {
return std::move(Data(size).FillWithZeroes());
return Data(size).FillWithZeroes();
}
static Data CreateData(unsigned int size, unsigned int seed = 0) {