From a5cee359ce48756a7916940b39b62a427c30ad31 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Tue, 29 Apr 2014 19:23:02 +0000 Subject: Whitespace fixes. --- lib/backupstore/BackupStoreContext.cpp | 4 ++-- lib/backupstore/BackupStoreDirectory.h | 2 +- lib/common/IOStream.h | 4 ++-- test/backupstore/testbackupstore.cpp | 13 ++++++------- 4 files changed, 11 insertions(+), 12 deletions(-) diff --git a/lib/backupstore/BackupStoreContext.cpp b/lib/backupstore/BackupStoreContext.cpp index 0fdbe106..5b94cd41 100644 --- a/lib/backupstore/BackupStoreContext.cpp +++ b/lib/backupstore/BackupStoreContext.cpp @@ -1121,7 +1121,7 @@ int64_t BackupStoreContext::AddDirectory(int64_t InDirectory, } // Commit the file - dirFile.Commit(BACKUP_STORE_CONVERT_TO_RAID_IMMEDIATELY); + dirFile.Commit(BACKUP_STORE_CONVERT_TO_RAID_IMMEDIATELY); // Make sure the size of the directory is added to the usage counts in the info ASSERT(dirSize > 0); @@ -1151,7 +1151,7 @@ int64_t BackupStoreContext::AddDirectory(int64_t InDirectory, RemoveDirectoryFromCache(InDirectory); // Don't worry about the incremented number in the store info - throw; + throw; } // Save the store info (may not be postponed) diff --git a/lib/backupstore/BackupStoreDirectory.h b/lib/backupstore/BackupStoreDirectory.h index 6632b8b8..65c60a83 100644 --- a/lib/backupstore/BackupStoreDirectory.h +++ b/lib/backupstore/BackupStoreDirectory.h @@ -139,7 +139,7 @@ public: void WriteToStreamDependencyInfo(IOStream &rStream) const; private: - BackupStoreFilename mName; + BackupStoreFilename mName; box_time_t mModificationTime; int64_t mObjectID; int64_t mSizeInBlocks; diff --git a/lib/common/IOStream.h b/lib/common/IOStream.h index 51aef19f..81f1cfa6 100644 --- a/lib/common/IOStream.h +++ b/lib/common/IOStream.h @@ -58,12 +58,12 @@ public: virtual bool StreamDataLeft() = 0; // Has the stream been closed (writing not possible) virtual bool StreamClosed() = 0; - + // Utility functions bool ReadFullBuffer(void *pBuffer, int NBytes, int *pNBytesRead, int Timeout = IOStream::TimeOutInfinite); bool CopyStreamTo(IOStream &rCopyTo, int Timeout = IOStream::TimeOutInfinite, int BufferSize = 1024); void Flush(int Timeout = IOStream::TimeOutInfinite); - + static int ConvertSeekTypeToOSWhence(int SeekType); virtual std::string ToString() const; }; diff --git a/test/backupstore/testbackupstore.cpp b/test/backupstore/testbackupstore.cpp index ad405303..7431e542 100644 --- a/test/backupstore/testbackupstore.cpp +++ b/test/backupstore/testbackupstore.cpp @@ -1849,7 +1849,7 @@ bool test_directory_parent_entry_tracks_directory_size() 0, false); BackupProtocolLocal2 protocolReadOnly(0x01234567, "test", "backup/01234567/", 0, true); // read only - + int64_t subdirid = create_directory(protocol); // Get the root directory cached in the read-only connection, and @@ -1876,7 +1876,7 @@ bool test_directory_parent_entry_tracks_directory_size() new_size = get_raid_file(subdirid)->GetDiscUsageInBlocks(); } - // Check that the root directory entry has been updated + // Check that the root directory entry has been updated TEST_EQUAL(new_size, get_object_size(protocolReadOnly, subdirid, BACKUPSTORE_ROOT_DIRECTORY_ID)); @@ -1884,7 +1884,7 @@ bool test_directory_parent_entry_tracks_directory_size() protocol.QueryDeleteFile(subdirid, BackupStoreFilenameClear(last_added_filename)); - // Reduce the limits, to remove it permanently from the store + // Reduce the limits, to remove it permanently from the store protocol.QueryFinished(); protocolReadOnly.QueryFinished(); TEST_THAT(change_account_limits("0B", "20000B")); @@ -1987,7 +1987,7 @@ bool test_directory_parent_entry_tracks_directory_size() BACKUPSTORE_ROOT_DIRECTORY_ID)); protocolReadOnly.QueryFinished(); - tearDown(); + tearDown(); return true; } @@ -2269,7 +2269,7 @@ bool test_store_info() TEST_THAT(delfiles[1] == 4); } - tearDown(); + tearDown(); return true; } @@ -2532,7 +2532,7 @@ bool test_housekeeping_deletes_files() // will investigate. delete_account(); - tearDown(); + tearDown(); return true; } @@ -2616,7 +2616,6 @@ int multi_server() TEST_THAT(StopServer()); } - return 0; } -- cgit v1.2.3