From 9e025fd0ea42782e93363958804c6e2437b44a30 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 28 Jan 2006 00:13:44 +0000 Subject: * configure.ac * bin/bbstored/backupprotocol.txt * bin/bbstored/BackupCommands.cpp * bin/bbackupd/BackupClientContext.cpp * bin/bbackupd/BackupClientContext.h * bin/bbackupd/BackupClientDirectoryRecord.cpp * bin/bbackupd/BackupDaemon.cpp * lib/backupclient/BackupStoreFileDiff.cpp * lib/backupclient/BackupDaemonConfigVerify.cpp * lib/backupclient/BackupStoreFile.h * test/backupstore/testbackupstore.cpp * test/backupstorepatch/testbackupstorepatch.cpp - Applied changes from chris/diff-timeout-and-ssl-keepalive * test/backupdiff/testbackupdiff.cpp - Fixed test to match new prototype for EncodeFileDiff --- test/backupstorepatch/testbackupstorepatch.cpp | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'test/backupstorepatch/testbackupstorepatch.cpp') diff --git a/test/backupstorepatch/testbackupstorepatch.cpp b/test/backupstorepatch/testbackupstorepatch.cpp index a4a1ece3..5d77c3fd 100644 --- a/test/backupstorepatch/testbackupstorepatch.cpp +++ b/test/backupstorepatch/testbackupstorepatch.cpp @@ -376,10 +376,17 @@ int test(int argc, const char *argv[]) char filename[64]; ::sprintf(filename, "testfiles/%d.test", f); bool isCompletelyDifferent = false; - std::auto_ptr patchStream(BackupStoreFile::EncodeFileDiff(filename, + std::auto_ptr patchStream( + BackupStoreFile::EncodeFileDiff( + filename, BackupProtocolClientListDirectory::RootDirectory, /* containing directory */ - storeFilename, diffFromID, *blockIndexStream, - protocol.GetTimeout(), 0 /* not interested in the modification time */, &isCompletelyDifferent)); + storeFilename, + diffFromID, + *blockIndexStream, + protocol.GetTimeout(), + NULL, // DiffTimer impl + 0 /* not interested in the modification time */, + &isCompletelyDifferent)); // Upload the patch to the store std::auto_ptr stored(protocol.QueryStoreFile( -- cgit v1.2.1