Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_filedb / lib / AtomicFile.cpp

diff --git a/OSX/libsecurity_filedb/lib/AtomicFile.cpp b/OSX/libsecurity_filedb/lib/AtomicFile.cpp
index 6c21d12d2ab272967dd019f3802627475467881f..24ca9907493b1fa4713737b8501f6978db44dc49 100644 (file)
--- a/OSX/libsecurity_filedb/lib/AtomicFile.cpp
+++ b/OSX/libsecurity_filedb/lib/AtomicFile.cpp
@@ -36,7 +36,7 @@
 #include <copyfile.h>
 #include <sandbox.h>
 #include <set>
 #include <copyfile.h>
 #include <sandbox.h>
 #include <set>

-#include <assert.h>
+#include <security_utilities/simulatecrash_assert.h>

 
 #define kAtomicFileMaxBlockSize INT_MAX
 
 
 #define kAtomicFileMaxBlockSize INT_MAX
 


@@ -391,8 +391,8 @@ AtomicBufferedFile::~AtomicBufferedFile()
 {
        if (mFileRef >= 0)
        {
 {
        if (mFileRef >= 0)
        {

-               // In release mode, the assert() is compiled out so rv may be unused.
-               __unused int rv = AtomicFile::rclose(mFileRef);
+               // In release mode, the assert() is compiled out so rv may be unused.
+               __unused int rv = AtomicFile::rclose(mFileRef);

                assert(rv == 0);
                secinfo("atomicfile", "%p closed %s", this, mPath.c_str());
        }
                assert(rv == 0);
                secinfo("atomicfile", "%p closed %s", this, mPath.c_str());
        }


@@ -830,7 +830,7 @@ AtomicTempFile::commit()
 
 // Rollback the current create or write (happens automatically if commit() isn't called before the destructor is.
 void
 
 // Rollback the current create or write (happens automatically if commit() isn't called before the destructor is.
 void

-AtomicTempFile::rollback() throw()
+AtomicTempFile::rollback() _NOEXCEPT

 {
        if (mFileRef >= 0)
        {
 {
        if (mFileRef >= 0)
        {


@@ -1240,7 +1240,7 @@ AtomicLockedFile::lock(mode_t mode)
 
 
 
 
 
 

-void AtomicLockedFile::unlock() throw()
+void AtomicLockedFile::unlock() _NOEXCEPT

 {
        mFileLocker->unlock();
 }
 {
        mFileLocker->unlock();
 }