Fix build

This commit is contained in:
Martin Raiber 2021-05-08 09:19:37 +02:00
parent 3f6e37ad2e
commit 1e9d4396a9
4 changed files with 19 additions and 4 deletions

View File

@ -402,7 +402,7 @@ bool SparseFile::Resize(int64 new_size, bool set_sparse)
return backing_file->Resize(mapToBackingOffset(new_size), set_sparse);
}
std::vector<IFsFile::SFileExtent> SparseFile::getFileExtents(int64 starting_offset, int64 block_size, bool & more_data)
std::vector<IFsFile::SFileExtent> SparseFile::getFileExtents(int64 starting_offset, int64 block_size, bool & more_data, unsigned int flags)
{
return std::vector<SFileExtent>();
}

View File

@ -46,7 +46,7 @@ public:
virtual void resetSparseExtentIter();
virtual SSparseExtent nextSparseExtent();
virtual bool Resize(int64 new_size, bool set_sparse=true);
virtual std::vector<SFileExtent> getFileExtents(int64 starting_offset, int64 block_size, bool& more_data);
virtual std::vector<SFileExtent> getFileExtents(int64 starting_offset, int64 block_size, bool& more_data, unsigned int flags);
virtual IVdlVolCache* createVdlVolCache();
virtual int64 getValidDataLength(IVdlVolCache* vol_cache);

13
urbackupcommon/events.h Normal file
View File

@ -0,0 +1,13 @@
#pragma once
#include <string>
#include <map>
static std::string extractLastLogErrors(size_t nerrors = 1, const std::string& extra_filter = std::string(), bool with_warn = false) {
return std::string();
}
static bool addSystemEvent(const std::string& evtid, const std::string& subj, const std::string& msg,
int prio, std::map<std::string, std::string> extra = std::map<std::string, std::string>()) {
return true;
}

View File

@ -928,6 +928,8 @@ bool os_link_symbolic_symlink(const std::string &target, const std::string &lnam
bool os_link_symbolic_junctions_raw(const std::string &target, const std::string &lname, void* transaction)
{
size_t bsize;
REPARSE_MOUNTPOINT_DATA_BUFFER* rb;
bool ret = false;
HANDLE hJunc = INVALID_HANDLE_VALUE;
char* buf = NULL;
@ -962,11 +964,11 @@ bool os_link_symbolic_junctions_raw(const std::string &target, const std::string
if(hJunc==INVALID_HANDLE_VALUE)
goto cleanup;
size_t bsize=sizeof(REPARSE_MOUNTPOINT_DATA_BUFFER) + (wtarget.size()+1) * sizeof(wchar_t)+30;
bsize=sizeof(REPARSE_MOUNTPOINT_DATA_BUFFER) + (wtarget.size()+1) * sizeof(wchar_t)+30;
buf=new char[bsize];
memset(buf, 0, bsize);
REPARSE_MOUNTPOINT_DATA_BUFFER *rb=(REPARSE_MOUNTPOINT_DATA_BUFFER*)buf;
rb=(REPARSE_MOUNTPOINT_DATA_BUFFER*)buf;
rb->ReparseTag=IO_REPARSE_TAG_MOUNT_POINT;
rb->ReparseTargetMaximumLength=(WORD)((wtarget.size()+1)*sizeof(wchar_t));
rb->ReparseTargetLength=rb->ReparseTargetMaximumLength-1*sizeof(wchar_t);