diff options
| author | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-07 16:34:47 +0000 |
|---|---|---|
| committer | Martin Ebourne <martin@ebourne.me.uk> | 2005-12-07 16:34:47 +0000 |
| commit | 81d8eda2419e7a23088a98cdfc52a305c9ceac0d (patch) | |
| tree | 27143d7b539a8bf2e23cc18e2f598804fa8d784d /lib/backupclient/BackupStoreFileCmbIdx.cpp | |
| parent | 065dc6f8cd168e3ee6e71ddfb06f42a92abfabbd (diff) | |
Merged martin/autoconf at r35 to trunk
Diffstat (limited to 'lib/backupclient/BackupStoreFileCmbIdx.cpp')
| -rw-r--r-- | lib/backupclient/BackupStoreFileCmbIdx.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/backupclient/BackupStoreFileCmbIdx.cpp b/lib/backupclient/BackupStoreFileCmbIdx.cpp index 253001c2..c8bcc3b9 100644 --- a/lib/backupclient/BackupStoreFileCmbIdx.cpp +++ b/lib/backupclient/BackupStoreFileCmbIdx.cpp @@ -156,10 +156,10 @@ void BSFCombinedIndexStream::Initialise(IOStream &rFrom) } // Read relevant data. - mNumEntriesToGo = ntoh64(mHeader.mNumBlocks); + mNumEntriesToGo = box_ntoh64(mHeader.mNumBlocks); // Adjust a bit to reflect the fact it's no longer a diff - mHeader.mOtherFileID = hton64(0); + mHeader.mOtherFileID = box_hton64(0); // Now look at the from file: Read header file_BlockIndexHeader fromHdr; @@ -173,7 +173,7 @@ void BSFCombinedIndexStream::Initialise(IOStream &rFrom) } // Then... allocate memory for the list of sizes - mNumEntriesInFromFile = ntoh64(fromHdr.mNumBlocks); + mNumEntriesInFromFile = box_ntoh64(fromHdr.mNumBlocks); mFromBlockSizes = (int64_t*)::malloc(mNumEntriesInFromFile * sizeof(int64_t)); if(mFromBlockSizes == 0) { @@ -190,7 +190,7 @@ void BSFCombinedIndexStream::Initialise(IOStream &rFrom) } // Check that the from file isn't a delta in itself - if(ntoh64(e.mEncodedSize) <= 0) + if(box_ntoh64(e.mEncodedSize) <= 0) { THROW_EXCEPTION(BackupStoreException, OnCombineFromFileIsIncomplete) } @@ -256,7 +256,7 @@ int BSFCombinedIndexStream::Read(void *pBuffer, int NBytes, int Timeout) } // Does this need adjusting? - int s = ntoh64(poutput[b].mEncodedSize); + int s = box_ntoh64(poutput[b].mEncodedSize); if(s <= 0) { // A reference to a block in the from file |