Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_utilities / lib / errors.h

diff --git a/OSX/libsecurity_utilities/lib/errors.h b/OSX/libsecurity_utilities/lib/errors.h
index 4725bee5cb8cc65bb9939e147684cb9bebf40bf6..b0cf718d487983bbad069266524369fef2048846 100644 (file)
--- a/OSX/libsecurity_utilities/lib/errors.h
+++ b/OSX/libsecurity_utilities/lib/errors.h
@@ -50,7 +50,7 @@ protected:
     CommonError();
     CommonError(const CommonError &source);
 public:
     CommonError();
     CommonError(const CommonError &source);
 public:

-    virtual ~CommonError() throw ();
+    virtual ~CommonError() _NOEXCEPT;

 
     virtual OSStatus osStatus() const = 0;
        virtual int unixError() const = 0;
 
     virtual OSStatus osStatus() const = 0;
        virtual int unixError() const = 0;


@@ -69,15 +69,16 @@ public:
 class UnixError : public CommonError {
 protected:
     UnixError();
 class UnixError : public CommonError {
 protected:
     UnixError();

-    UnixError(int err);
+    UnixError(int err, bool suppresslogging);

 public:
     const int error;
     virtual OSStatus osStatus() const;
        virtual int unixError() const;
 public:
     const int error;
     virtual OSStatus osStatus() const;
        virtual int unixError() const;

-    virtual const char *what () const throw ();
+    virtual const char *what () const _NOEXCEPT;

     
     static void check(int result)              { if (result == -1) throwMe(); }
     static void throwMe(int err = errno) __attribute__((noreturn));
     
     static void check(int result)              { if (result == -1) throwMe(); }
     static void throwMe(int err = errno) __attribute__((noreturn));

+    static void throwMeNoLogging(int err = errno) __attribute__((noreturn));

 
     // @@@ This is a hack for the Network protocol state machine
     static UnixError make(int err = errno) DEPRECATED_ATTRIBUTE;
 
     // @@@ This is a hack for the Network protocol state machine
     static UnixError make(int err = errno) DEPRECATED_ATTRIBUTE;


@@ -95,10 +96,11 @@ public:
     const int error;
     virtual OSStatus osStatus() const;
        virtual int unixError() const;
     const int error;
     virtual OSStatus osStatus() const;
        virtual int unixError() const;

-    virtual const char *what () const throw ();
+    virtual const char *what () const _NOEXCEPT;

     
     static void check(OSStatus status) { if (status != errSecSuccess) throwMe(status); }
     static void throwMe(int err) __attribute__((noreturn));
     
     static void check(OSStatus status) { if (status != errSecSuccess) throwMe(status); }
     static void throwMe(int err) __attribute__((noreturn));

+    static void throwMe(int err, char const *message, ...) __attribute__((noreturn));

 
     static MacOSError make(int err);
 };
 
     static MacOSError make(int err);
 };


@@ -118,7 +120,7 @@ protected:
 public:
        virtual OSStatus osStatus() const;
        virtual int unixError() const;
 public:
        virtual OSStatus osStatus() const;
        virtual int unixError() const;

-       virtual const char *what () const throw ();
+       virtual const char *what () const _NOEXCEPT;

        
        template <class T>
        static void check(const T &p)           { if (!p) throwMe(); }
        
        template <class T>
        static void check(const T &p)           { if (!p) throwMe(); }