diff options
| -rw-r--r-- | bin/bbackupd/BackupClientDirectoryRecord.cpp | 6 | ||||
| -rw-r--r-- | lib/common/IOStreamGetLine.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/bin/bbackupd/BackupClientDirectoryRecord.cpp b/bin/bbackupd/BackupClientDirectoryRecord.cpp index a6848c27..e8dddd6f 100644 --- a/bin/bbackupd/BackupClientDirectoryRecord.cpp +++ b/bin/bbackupd/BackupClientDirectoryRecord.cpp @@ -1732,11 +1732,11 @@ int64_t BackupClientDirectoryRecord::UploadFile( { diffFromID = 0; } - + rContext.UnManageDiffProcess(); - } + } } - + if(!apStreamToUpload.get()) // No patch upload, so do a normal upload { // below threshold or nothing to diff from, so upload whole diff --git a/lib/common/IOStreamGetLine.h b/lib/common/IOStreamGetLine.h index c4289073..7667642d 100644 --- a/lib/common/IOStreamGetLine.h +++ b/lib/common/IOStreamGetLine.h @@ -37,12 +37,12 @@ public: // Call to detach, setting file pointer correctly to last bit read. // Only works for lseek-able file descriptors. void DetachFile(); - + virtual bool IsStreamDataLeft() { return mrStream.StreamDataLeft(); } - + // For doing interesting stuff with the remaining data... // Be careful with this! const void *GetBufferedData() const {return mBuffer + mBufferBegin;} @@ -52,7 +52,7 @@ public: protected: int ReadMore(int Timeout = IOStream::TimeOutInfinite); - + private: IOStream &mrStream; }; |