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 /test/backupdiff/testbackupdiff.cpp | |
| parent | 065dc6f8cd168e3ee6e71ddfb06f42a92abfabbd (diff) | |
Merged martin/autoconf at r35 to trunk
Diffstat (limited to 'test/backupdiff/testbackupdiff.cpp')
| -rwxr-xr-x | test/backupdiff/testbackupdiff.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/backupdiff/testbackupdiff.cpp b/test/backupdiff/testbackupdiff.cpp index 5fb10038..7845433c 100755 --- a/test/backupdiff/testbackupdiff.cpp +++ b/test/backupdiff/testbackupdiff.cpp @@ -103,9 +103,9 @@ void check_encoded_file(const char *filename, int64_t OtherFileID, int new_block file_BlockIndexHeader hdr; TEST_THAT(enc.ReadFullBuffer(&hdr, sizeof(hdr), 0)); TEST_THAT(hdr.mMagicValue == (int32_t)htonl(OBJECTMAGIC_FILE_BLOCKS_MAGIC_VALUE_V1)); - TEST_THAT((uint64_t)ntoh64(hdr.mOtherFileID) == (uint64_t)OtherFileID); + TEST_THAT((uint64_t)box_ntoh64(hdr.mOtherFileID) == (uint64_t)OtherFileID); // number of blocks - int64_t nblocks = ntoh64(hdr.mNumBlocks); + int64_t nblocks = box_ntoh64(hdr.mNumBlocks); TRACE2("Reading index from '%s', has %lld blocks\n", filename, nblocks); TRACE0("======== ===== ========== ======== ========\n Index Where EncSz/Idx Size WChcksm\n"); // Read them all in @@ -114,7 +114,7 @@ void check_encoded_file(const char *filename, int64_t OtherFileID, int new_block { file_BlockIndexEntry en; TEST_THAT(enc.ReadFullBuffer(&en, sizeof(en), 0)); - int64_t s = ntoh64(en.mEncodedSize); + int64_t s = box_ntoh64(en.mEncodedSize); if(s > 0) { nnew++; @@ -126,7 +126,7 @@ void check_encoded_file(const char *filename, int64_t OtherFileID, int new_block TRACE2("%8lld other i=%8lld", b, 0 - s); } // Decode the rest - uint64_t iv = ntoh64(hdr.mEntryIVBase); + uint64_t iv = box_ntoh64(hdr.mEntryIVBase); iv += b; sBlowfishDecryptBlockEntry.SetIV(&iv); file_BlockIndexEntryEnc entryEnc; |