Security-59306.61.1.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..507b270ca3a4d74618562ef5c0c8103962996793 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;
 
        Mutex* getKeychainMutex();
        Mutex* getMutexForObject() const;
 

-    ReadWriteLock* getKeychainReadWriteLock();

        void aboutToDestruct();
 
        bool operator ==(const KeychainImpl &) const;
        void aboutToDestruct();
 
        bool operator ==(const KeychainImpl &) const;


@@ -317,17 +316,12 @@ private:
        DefaultCredentials mCustomUnlockCreds;
        bool mIsInBatchMode;
        EventBuffer *mEventBuffer;
        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;
 
     // 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;

 };
 
 
 };