Security-55471.14.4.tar.gz

[apple/security.git] / libsecurity_transform / lib / Transform.cpp

diff --git a/libsecurity_transform/lib/Transform.cpp b/libsecurity_transform/lib/Transform.cpp
index 4d7910f7ec8960afa2e5a11bc3f81a80abca7d8d..5ec84b8e6e66b3921780092384a1178175600d95 100644 (file)
--- a/libsecurity_transform/lib/Transform.cpp
+++ b/libsecurity_transform/lib/Transform.cpp
@@ -12,6 +12,7 @@
 #include "SecTransformInternal.h"
 #include "GroupTransform.h"
 #include "GroupTransform.h"
 #include "SecTransformInternal.h"
 #include "GroupTransform.h"
 #include "GroupTransform.h"

+#include <pthread.h>

 
 static const int kMaxPendingTransactions = 20;
 
 
 static const int kMaxPendingTransactions = 20;
 


@@ -1423,7 +1424,7 @@ CFErrorRef Transform::ExecuteOperation(CFStringRef &outputAttached, SecMonitorRe
        for (i = 0; i < numAttributes; ++i)
        {
                transform_attribute *ta = attributes[i];
        for (i = 0; i < numAttributes; ++i)
        {
                transform_attribute *ta = attributes[i];

-               int arraySize = ta->connections ? CFArrayGetCount(ta->connections) : 0;
+               CFIndex arraySize = ta->connections ? CFArrayGetCount(ta->connections) : 0;

                if (arraySize == 0 && ta->requires_outbound_connection)
                {
                        if (CFStringCompare(ta->name, kSecTransformOutputAttributeName, 0) == kCFCompareEqualTo) {
                if (arraySize == 0 && ta->requires_outbound_connection)
                {
                        if (CFStringCompare(ta->name, kSecTransformOutputAttributeName, 0) == kCFCompareEqualTo) {


@@ -1547,15 +1548,6 @@ static Boolean CFTypeOrNULLEqual(const void *value1, const void *value2) {
        }
 }
 
        }
 }
 

-CFHashCode CFTypeOrNULLHash(const void *value) {
-       if (value != NULL) {
-               return CFHash(value);
-       } else {
-               return 42;
-       }
-}
-
-

 // Returns a dictionary of all the meta attributes that will need to be reset on a RestoreState
 CFDictionaryRef Transform::GetAHDictForSaveState(SecTransformStringOrAttributeRef key)
 {
 // Returns a dictionary of all the meta attributes that will need to be reset on a RestoreState
 CFDictionaryRef Transform::GetAHDictForSaveState(SecTransformStringOrAttributeRef key)
 {


@@ -1810,7 +1802,7 @@ CFErrorRef Transform::ProcessExternalize(CFMutableArrayRef transforms, CFMutable
        // walk the forward links
        for (i = 0; i < numAttributes; ++i)
        {
        // walk the forward links
        for (i = 0; i < numAttributes; ++i)
        {

-               int arraySize = attributes[i]->connections ? CFArrayGetCount(attributes[i]->connections) : 0;
+               CFIndex arraySize = attributes[i]->connections ? CFArrayGetCount(attributes[i]->connections) : 0;

                if (arraySize != 0)
                {
                        CFIndex j;
                if (arraySize != 0)
                {
                        CFIndex j;