Security-58286.20.16.tar.gz

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

diff --git a/OSX/libsecurity_keychain/lib/SecImportExportUtils.h b/OSX/libsecurity_keychain/lib/SecImportExportUtils.h
index 7b02ac0ee80672162a4b4494b6673b58a39392b7..78ccc31d8a52b0a0cc21fa6483ee862865c0db6f 100644 (file)
--- a/OSX/libsecurity_keychain/lib/SecImportExportUtils.h
+++ b/OSX/libsecurity_keychain/lib/SecImportExportUtils.h
@@ -26,9 +26,9 @@
 #ifndef        _SECURITY_SEC_IMPORT_EXPORT_UTILS_H_
 #define _SECURITY_SEC_IMPORT_EXPORT_UTILS_H_
 
 #ifndef        _SECURITY_SEC_IMPORT_EXPORT_UTILS_H_
 #define _SECURITY_SEC_IMPORT_EXPORT_UTILS_H_
 

-#include "SecImportExport.h"
+#include <Security/SecImportExport.h>

 #include "SecKeychainPriv.h"
 #include "SecKeychainPriv.h"

-#include "SecBasePriv.h"
+#include <Security/SecBasePriv.h>

 #include <security_utilities/debugging.h>
 #include <security_utilities/errors.h>
 
 #include <security_utilities/debugging.h>
 #include <security_utilities/errors.h>
 


@@ -69,8 +69,8 @@ extern const char *impExpExtItemTypeStr(SecExternalItemType itemType);
 
 #endif  /* NDEBUG */
 
 
 #endif  /* NDEBUG */
 

-#define SecImpExpDbg(args...)  secdebug("SecImpExp", ## args)
-#define SecImpInferDbg(args...)        secdebug("SecImpInfer", ## args)
+#define SecImpExpDbg(args...)  secinfo("SecImpExp", ## args)
+#define SecImpInferDbg(args...)        secinfo("SecImpInfer", ## args)

 
 /* 
  * Parse file extension and attempt to map it to format and type. Returns true 
 
 /* 
  * Parse file extension and attempt to map it to format and type. Returns true 


@@ -82,7 +82,7 @@ bool impExpImportParseFileExten(
        SecExternalItemType     *itemType);             // RETURNED
 
 /* do a [NSString stringByDeletingPathExtension] equivalent */
        SecExternalItemType     *itemType);             // RETURNED
 
 /* do a [NSString stringByDeletingPathExtension] equivalent */

-CFStringRef impExpImportDeleteExtension(
+CFStringRef CF_RETURNS_RETAINED impExpImportDeleteExtension(

        CFStringRef                     fileStr);
 
 /*
        CFStringRef                     fileStr);
 
 /*