Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_keychain / lib / Keychains.h

diff --git a/OSX/libsecurity_keychain/lib/Keychains.h b/OSX/libsecurity_keychain/lib/Keychains.h
index 0e0c87f9f7f5d41236023da1c88d874c44708415..b33ae6a4b28ad07ac6a65e5d2f11bf980a15a4f3 100644 (file)
--- a/OSX/libsecurity_keychain/lib/Keychains.h
+++ b/OSX/libsecurity_keychain/lib/Keychains.h
@@ -138,7 +138,6 @@ public:
        Mutex* getKeychainMutex();
        Mutex* getMutexForObject() const;
 
-    ReadWriteLock* getKeychainReadWriteLock();
        void aboutToDestruct();
 
        bool operator ==(const KeychainImpl &) const;
@@ -219,8 +218,8 @@ public:
        const AccessCredentials *defaultCredentials();
 
        // Only call these functions while holding globals().apiLock.
-       bool inCache() const throw() { return mInCache; }
-       void inCache(bool inCache) throw() { mInCache = inCache; }
+       bool inCache() const _NOEXCEPT { return mInCache; }
+       void inCache(bool inCache) _NOEXCEPT { mInCache = inCache; }
        
        void postEvent(SecKeychainEvent kcEvent, ItemImpl* item);
     void postEvent(SecKeychainEvent kcEvent, ItemImpl* item, PrimaryKey pk);
@@ -317,17 +316,12 @@ private:
        DefaultCredentials mCustomUnlockCreds;
        bool mIsInBatchMode;
        EventBuffer *mEventBuffer;
-       Mutex mMutex;
+    mutable Mutex mMutex;
 
     // Now that we sometimes change the database object, Db object
     // creation/returning needs a mutex. You should only hold this if you're
     // copying or changing the mDb object.
     Mutex mDbMutex;
-
-    // Used to protect mDb across calls.
-    // Grab a read lock if you expect to read from this keychain in the future.
-    // The write lock is taken if we're replacing the database wholesale with something new.
-    ReadWriteLock mRWLock;
 };