Merging upstream version 1.76.0+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 34 insertions, 4 deletions

diff --git a/vendor/core-foundation-sys/src/error.rs b/vendor/core-foundation-sys/src/error.rs
index 8a4c1d494..e8ebd6c42 100644
--- a/vendor/core-foundation-sys/src/error.rs
+++ b/vendor/core-foundation-sys/src/error.rs
@@ -9,24 +9,54 @@
 
 use std::os::raw::c_void;
 
-use base::{CFTypeID, CFIndex};
-use string::CFStringRef;
+use crate::base::{CFAllocatorRef, CFIndex, CFTypeID};
+use crate::dictionary::CFDictionaryRef;
+use crate::string::CFStringRef;
 
 #[repr(C)]
 pub struct __CFError(c_void);
 
 pub type CFErrorRef = *mut __CFError;
+pub type CFErrorDomain = CFStringRef;
 
 extern "C" {
-    pub fn CFErrorGetTypeID() -> CFTypeID;
+    /*
+     * CFError.h
+     */
 
+    /* Error domains */
     pub static kCFErrorDomainPOSIX: CFStringRef;
     pub static kCFErrorDomainOSStatus: CFStringRef;
     pub static kCFErrorDomainMach: CFStringRef;
     pub static kCFErrorDomainCocoa: CFStringRef;
 
+    /* Keys for the user info dictionary */
+    pub static kCFErrorLocalizedDescriptionKey: CFStringRef;
+    // pub static kCFErrorLocalizedFailureKey: CFStringRef; // macos(10.13)+
+    pub static kCFErrorLocalizedFailureReasonKey: CFStringRef;
+    pub static kCFErrorLocalizedRecoverySuggestionKey: CFStringRef;
+    pub static kCFErrorDescriptionKey: CFStringRef;
+    pub static kCFErrorUnderlyingErrorKey: CFStringRef;
+    pub static kCFErrorURLKey: CFStringRef;
+    pub static kCFErrorFilePathKey: CFStringRef;
+
+    /* Creating a CFError */
+    pub fn CFErrorCreate(
+        allocator: CFAllocatorRef,
+        domain: CFErrorDomain,
+        code: CFIndex,
+        userInfo: CFDictionaryRef,
+    ) -> CFErrorRef;
+    //pub fn CFErrorCreateWithUserInfoKeysAndValues
+
+    /* Getting Information About an Error */
     pub fn CFErrorGetDomain(err: CFErrorRef) -> CFStringRef;
     pub fn CFErrorGetCode(err: CFErrorRef) -> CFIndex;
-
+    pub fn CFErrorCopyUserInfo(err: CFErrorRef) -> CFDictionaryRef;
     pub fn CFErrorCopyDescription(err: CFErrorRef) -> CFStringRef;
+    pub fn CFErrorCopyFailureReason(err: CFErrorRef) -> CFStringRef;
+    pub fn CFErrorCopyRecoverySuggestion(err: CFErrorRef) -> CFStringRef;
+
+    /* Getting the CFError Type ID */
+    pub fn CFErrorGetTypeID() -> CFTypeID;
 }