Security-59754.80.3.tar.gz

[apple/security.git] / OSX / libsecurity_cssm / lib / attachment.cpp

diff --git a/OSX/libsecurity_cssm/lib/attachment.cpp b/OSX/libsecurity_cssm/lib/attachment.cpp
index de8aae2ed47a5f097e1ea8c59b4700756d0ee0a8..f697dbb13c5e864d15679441635447461885689b 100644 (file)
--- a/OSX/libsecurity_cssm/lib/attachment.cpp
+++ b/OSX/libsecurity_cssm/lib/attachment.cpp
@@ -81,7 +81,7 @@ Attachment::Attachment(Module *parent,
             &upcalls,
             &spiFunctionTable)) {
         // attach rejected by module
-               secdebug("cssm", "attach of module %p(%s) failed",
+               secinfo("cssm", "attach of module %p(%s) failed",
                        &module, module.name().c_str());
         CssmError::throwMe(err);
     }
@@ -89,7 +89,7 @@ Attachment::Attachment(Module *parent,
         if (spiFunctionTable == NULL || spiFunctionTable->ServiceType != subserviceType())
             CssmError::throwMe(CSSMERR_CSSM_INVALID_ADDIN_FUNCTION_TABLE);
         mIsActive = true;      // now officially attached to plugin
-               secdebug("cssm", "%p attached module %p(%s) (ssid %ld type %ld)",
+               secinfo("cssm", "%p attached module %p(%s) (ssid %ld type %ld)",
                        this, parent, parent->name().c_str(), (long)ssId, (long)ssType);
         // subclass is responsible for taking spiFunctionTable and build
         // whatever dispatch is needed
@@ -116,7 +116,7 @@ void Attachment::detach(bool isLocked)
             CssmError::throwMe(CSSM_ERRCODE_FUNCTION_FAILED);  //@#attachment busy
         if (CSSM_RETURN error = module.plugin->detach(handle()))
                        CssmError::throwMe(error);      // I'm sorry Dave, ...
-               secdebug("cssm", "%p detach module %p(%s)", this,
+               secinfo("cssm", "%p detach module %p(%s)", this,
                        &module, module.name().c_str());
         mIsActive = false;
         module.detach(this);
@@ -145,28 +145,28 @@ Attachment::~Attachment()
 //
 void *Attachment::upcallMalloc(CSSM_HANDLE handle, size_t size)
 {
-    BEGIN_API
+    BEGIN_API_NO_METRICS
     return HandleObject::find<Attachment>(handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).malloc(size);
     END_API1(NULL)
 }
 
 void Attachment::upcallFree(CSSM_HANDLE handle, void *mem)
 {
-    BEGIN_API
+    BEGIN_API_NO_METRICS
     return HandleObject::find<Attachment>(handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).free(mem);
     END_API0
 }
 
 void *Attachment::upcallRealloc(CSSM_HANDLE handle, void *mem, size_t size)
 {
-    BEGIN_API
+    BEGIN_API_NO_METRICS
     return HandleObject::find<Attachment>(handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).realloc(mem, size);
     END_API1(NULL)
 }
 
 void *Attachment::upcallCalloc(CSSM_HANDLE handle, size_t num, size_t size)
 {
-    BEGIN_API
+    BEGIN_API_NO_METRICS
     return HandleObject::find<Attachment>(handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).calloc(size, num);
     END_API1(NULL)
 }
@@ -174,8 +174,7 @@ void *Attachment::upcallCalloc(CSSM_HANDLE handle, size_t num, size_t size)
 CSSM_RETURN Attachment::upcallCcToHandle(CSSM_CC_HANDLE handle,
                                          CSSM_MODULE_HANDLE *modHandle)
 {
-    BEGIN_API
-#warning Cast from CSSM_CC_HANDLE to CSSM_HANDLE
+    BEGIN_API_NO_METRICS
     Required(modHandle) = HandleObject::find<HandleContext>((CSSM_HANDLE)handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).attachment.handle();
     END_API(CSP)
 }
@@ -191,7 +190,7 @@ CSSM_RETURN Attachment::upcallGetModuleInfo(CSSM_MODULE_HANDLE handle,
                                             CSSM_FUNC_NAME_ADDR_PTR FunctionTable,
                                             uint32 NumFunctions)
 {
-    BEGIN_API
+    BEGIN_API_NO_METRICS
     Attachment &attachment = HandleObject::find<Attachment>(handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE);
     Required(guid) = attachment.myGuid();
     Required(version) = attachment.mVersion;