Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename [Un]Register* functions to Add/Remove*.

Browse Source
This commit is contained in:
Michael Lotz 2012-01-03 17:15:24 +01:00 committed by Ryan Leavengood
parent dc1acef865
commit b73982892d
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
headers/os/app/KeyStore.h
View File

@ -41,12 +41,10 @@ public:
bool secondaryIdentifierOptional,
BKey& key);
status_t RegisterKey(const BKey& key);
status_t RegisterKey(const char* keyring,
const BKey& key);
status_t UnregisterKey(const BKey& key);
status_t UnregisterKey(const char* keyring,
const BKey& key);
status_t AddKey(const BKey& key);
status_t AddKey(const char* keyring, const BKey& key);
status_t RemoveKey(const BKey& key);
status_t RemoveKey(const char* keyring, const BKey& key);
status_t GetNextKey(uint32& cookie, BKey& key);
status_t GetNextKey(BKeyType type, BKeyPurpose purpose,
@ -59,9 +57,9 @@ public:
// Keyrings
status_t RegisterKeyring(const char* keyring,
status_t AddKeyring(const char* keyring,
const BKey& key);
status_t UnregisterKeyring(const char* keyring);
status_t RemoveKeyring(const char* keyring);
status_t GetNextKeyring(uint32& cookie,
BString& keyring);

16
src/kits/app/KeyStore.cpp
View File

@ -74,28 +74,28 @@ BKeyStore::GetKey(const char* keyring, BKeyType type, BKeyPurpose purpose,
status_t
BKeyStore::RegisterKey(const BKey& key)
BKeyStore::AddKey(const BKey& key)
{
return RegisterKey(NULL, key);
return AddKey(NULL, key);
}
status_t
BKeyStore::RegisterKey(const char* keyring, const BKey& key)
BKeyStore::AddKey(const char* keyring, const BKey& key)
{
return B_ERROR;
}
status_t
BKeyStore::UnregisterKey(const BKey& key)
BKeyStore::RemoveKey(const BKey& key)
{
return UnregisterKey(NULL, key);
return RemoveKey(NULL, key);
}
status_t
BKeyStore::UnregisterKey(const char* keyring, const BKey& key)
BKeyStore::RemoveKey(const char* keyring, const BKey& key)
{
return B_ERROR;
}
@ -135,14 +135,14 @@ BKeyStore::GetNextKey(const char* keyring, BKeyType type, BKeyPurpose purpose,
status_t
BKeyStore::RegisterKeyring(const char* keyring, const BKey& key)
BKeyStore::AddKeyring(const char* keyring, const BKey& key)
{
return B_ERROR;
}
status_t
BKeyStore::UnregisterKeyring(const char* keyring)
BKeyStore::RemoveKeyring(const char* keyring)
{
return B_ERROR;
}