[Box Backup-commit] COMMIT r3210 - box/trunk/lib/backupstore

[subversion at boxbackup.org]

Author: chris
Date: 2014-02-07 20:03:30 +0000 (Fri, 07 Feb 2014)
New Revision: 3210

Modified:
   box/trunk/lib/backupstore/BackupStoreAccounts.cpp
Log:
Revert "Fix compile error introduced by bbstoreaccounts refactor."

This reverts commit 9d0580c58025ba94bee02cdc2aae3fe0b6ccf604.

Modified: box/trunk/lib/backupstore/BackupStoreAccounts.cpp
===================================================================
--- box/trunk/lib/backupstore/BackupStoreAccounts.cpp	2014-02-07 19:57:27 UTC (rev 3209)
+++ box/trunk/lib/backupstore/BackupStoreAccounts.cpp	2014-02-07 20:03:30 UTC (rev 3210)
@@ -120,10 +120,7 @@
 		info->Save();
 
 		// Create the refcount database
-		BackupStoreRefCountDatabase::CreateNew(Entry);
-		std::auto_ptr<BackupStoreRefCountDatabase> refcount(
-			BackupStoreRefCountDatabase::Load(Entry, false));
-		refcount->AddReference(BACKUPSTORE_ROOT_DIRECTORY_ID);
+		BackupStoreRefCountDatabase::Create(Entry)->Commit();
 	}
 
 	// As the original user...
@@ -413,7 +410,7 @@
 	std::cout << FormatUsageLineStart("Client store marker", mMachineReadableOutput) <<
 		info->GetLastObjectIDUsed() << std::endl;
 	std::cout << FormatUsageLineStart("Current Files", mMachineReadableOutput) <<
-		info->GetNumFiles() << std::endl;
+		info->GetNumCurrentFiles() << std::endl;
 	std::cout << FormatUsageLineStart("Old Files", mMachineReadableOutput) <<
 		info->GetNumOldFiles() << std::endl;
 	std::cout << FormatUsageLineStart("Deleted Files", mMachineReadableOutput) <<