Merge Arnaud Grandville's Windows fixes.

Merge branch 'master' of https://github.com/agrandville/boxbackup into appveyor

3 files changed, 11 insertions, 11 deletions

diff --git a/lib/backupstore/BackupStoreDirectory.cpp b/lib/backupstore/BackupStoreDirectory.cpp
index 332eca7a..d158cdd4 100644
--- a/lib/backupstore/BackupStoreDirectory.cpp
+++ b/lib/backupstore/BackupStoreDirectory.cpp
@@ -1,7 +1,7 @@
 // --------------------------------------------------------------------------
 //
 // File
-//		Name:    BackupStoreDirectory.h
+//		Name:    BackupStoreDirectory.cpp
 //		Purpose: Representation of a backup directory
 //		Created: 2003/08/26
 //
@@ -36,11 +36,6 @@ typedef struct
 	// Then a StreamableMemBlock for attributes
 } dir_StreamFormat;
 
-typedef enum
-{
-	Option_DependencyInfoPresent = 1
-} dir_StreamFormatOptions;
-
 typedef struct
 {
 	uint64_t mModificationTime;
@@ -172,7 +167,7 @@ void BackupStoreDirectory::ReadFromStream(IOStream &rStream, int Timeout)
 	int count = ntohl(hdr.mNumEntries);
 
 	// Clear existing list
-	for(std::vector<Entry*>::iterator i = mEntries.begin(); 
+	for(std::vector<Entry*>::iterator i = mEntries.begin();
 		i != mEntries.end(); i++)
 	{
 		delete (*i);
diff --git a/lib/backupstore/BackupStoreDirectory.h b/lib/backupstore/BackupStoreDirectory.h
index 5bbb0b35..788a3ad0 100644
--- a/lib/backupstore/BackupStoreDirectory.h
+++ b/lib/backupstore/BackupStoreDirectory.h
@@ -47,6 +47,11 @@ public:
 	}
 #endif
 
+	typedef enum
+	{
+		Option_DependencyInfoPresent = 1
+	} dir_StreamFormatOptions;
+
 	BackupStoreDirectory();
 	BackupStoreDirectory(int64_t ObjectID, int64_t ContainerID);
 	// Convenience constructor from a stream
diff --git a/lib/backupstore/BackupStoreFileEncodeStream.h b/lib/backupstore/BackupStoreFileEncodeStream.h
index 6db09182..5b9b4a61 100644
--- a/lib/backupstore/BackupStoreFileEncodeStream.h
+++ b/lib/backupstore/BackupStoreFileEncodeStream.h
@@ -90,6 +90,9 @@ public:
 	int64_t GetBytesToUpload() { return mBytesToUpload; }
 	int64_t GetTotalBytesSent() { return mTotalBytesSent; }
 
+	static void CalculateBlockSizes(int64_t DataSize, int64_t &rNumBlocksOut,
+		int32_t &rBlockSizeOut, int32_t &rLastBlockSizeOut);
+
 private:
 	enum
 	{
@@ -98,15 +101,12 @@ private:
 		Status_BlockListing = 2,
 		Status_Finished = 3
 	};
-	
-private:
+
 	void EncodeCurrentBlock();
-	void CalculateBlockSizes(int64_t DataSize, int64_t &rNumBlocksOut, int32_t &rBlockSizeOut, int32_t &rLastBlockSizeOut);
 	void SkipPreviousBlocksInInstruction();
 	void SetForInstruction();
 	void StoreBlockIndexEntry(int64_t WncSizeOrBlkIndex, int32_t ClearSize, uint32_t WeakChecksum, uint8_t *pStrongChecksum);
 
-private:
 	Recipe *mpRecipe;
 	IOStream *mpFile;					// source file
 	CollectInBufferStream mData;		// buffer for header and index entries