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 59ab540ccc4388ac64f55096c490aec8456d8ce1..f697dbb13c5e864d15679441635447461885689b 100644 (file)
--- a/OSX/libsecurity_cssm/lib/attachment.cpp
+++ b/OSX/libsecurity_cssm/lib/attachment.cpp
@@ -145,28 +145,28 @@ Attachment::~Attachment()
 //
 void *Attachment::upcallMalloc(CSSM_HANDLE handle, size_t size)
 {
 //
 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)
 {
     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)
 {
     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)
 {
     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)
 }
     return HandleObject::find<Attachment>(handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).calloc(size, num);
     END_API1(NULL)
 }


@@ -174,7 +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)
 {
 CSSM_RETURN Attachment::upcallCcToHandle(CSSM_CC_HANDLE handle,
                                          CSSM_MODULE_HANDLE *modHandle)
 {

-    BEGIN_API
+    BEGIN_API_NO_METRICS

     Required(modHandle) = HandleObject::find<HandleContext>((CSSM_HANDLE)handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).attachment.handle();
     END_API(CSP)
 }
     Required(modHandle) = HandleObject::find<HandleContext>((CSSM_HANDLE)handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE).attachment.handle();
     END_API(CSP)
 }


@@ -190,7 +190,7 @@ CSSM_RETURN Attachment::upcallGetModuleInfo(CSSM_MODULE_HANDLE handle,
                                             CSSM_FUNC_NAME_ADDR_PTR FunctionTable,
                                             uint32 NumFunctions)
 {
                                             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;
     Attachment &attachment = HandleObject::find<Attachment>(handle, CSSMERR_CSSM_INVALID_ADDIN_HANDLE);
     Required(guid) = attachment.myGuid();
     Required(version) = attachment.mVersion;