From 76676659f8ae6250d3db3ec23163d20850ee35f8 Mon Sep 17 00:00:00 2001 From: Matthew Chen Date: Fri, 12 Jan 2018 10:25:04 -0500 Subject: [PATCH] Respond to CR. --- SignalServiceKit/src/Storage/TSStorageManager.h | 4 ++-- SignalServiceKit/src/Storage/TSStorageManager.m | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/SignalServiceKit/src/Storage/TSStorageManager.h b/SignalServiceKit/src/Storage/TSStorageManager.h index b8b294401..12651ae9c 100644 --- a/SignalServiceKit/src/Storage/TSStorageManager.h +++ b/SignalServiceKit/src/Storage/TSStorageManager.h @@ -6,8 +6,8 @@ NS_ASSUME_NONNULL_BEGIN -void runSyncRegistrationsForPrimaryStorage(OWSStorage *storage); -void runAsyncRegistrationsForPrimaryStorage(OWSStorage *storage); +void runSyncRegistrationsForStorage(OWSStorage *storage); +void runAsyncRegistrationsForStorage(OWSStorage *storage); // TODO: Rename to OWSPrimaryStorage? @interface TSStorageManager : OWSStorage diff --git a/SignalServiceKit/src/Storage/TSStorageManager.m b/SignalServiceKit/src/Storage/TSStorageManager.m index 154e32ca9..ac27cd6e2 100644 --- a/SignalServiceKit/src/Storage/TSStorageManager.m +++ b/SignalServiceKit/src/Storage/TSStorageManager.m @@ -23,7 +23,7 @@ NSString *const TSStorageManagerExceptionName_CouldNotMoveDatabaseFile NSString *const TSStorageManagerExceptionName_CouldNotCreateDatabaseDirectory = @"TSStorageManagerExceptionName_CouldNotCreateDatabaseDirectory"; -void runSyncRegistrationsForPrimaryStorage(OWSStorage *storage) +void runSyncRegistrationsForStorage(OWSStorage *storage) { OWSCAssert(storage); @@ -37,7 +37,7 @@ void runSyncRegistrationsForPrimaryStorage(OWSStorage *storage) [OWSBatchMessageProcessor syncRegisterDatabaseExtension:storage]; } -void runAsyncRegistrationsForPrimaryStorage(OWSStorage *storage) +void runAsyncRegistrationsForStorage(OWSStorage *storage) { OWSCAssert(storage); @@ -109,7 +109,7 @@ void runAsyncRegistrationsForPrimaryStorage(OWSStorage *storage) - (void)runSyncRegistrations { - runSyncRegistrationsForPrimaryStorage(self); + runSyncRegistrationsForStorage(self); // See comments on OWSDatabaseConnection. // @@ -125,7 +125,7 @@ void runAsyncRegistrationsForPrimaryStorage(OWSStorage *storage) { OWSAssert(completion); - runAsyncRegistrationsForPrimaryStorage(self); + runAsyncRegistrationsForStorage(self); // Block until all async registrations are complete. YapDatabaseConnection *dbConnection = self.newDatabaseConnection;