Security-55471.14.8.tar.gz

[apple/security.git] / libsecurityd / lib / dictionary.cpp

diff --git a/libsecurityd/lib/dictionary.cpp b/libsecurityd/lib/dictionary.cpp
index bb15a65ea8ca09e7920c22e35289f662dea50732..f79ea20e5523e069b809f706159b2f3e298f44b9 100644 (file)
--- a/libsecurityd/lib/dictionary.cpp
+++ b/libsecurityd/lib/dictionary.cpp
@@ -88,7 +88,7 @@ NameValuePair::~NameValuePair ()
 void NameValuePair::Export (CssmData &data) const
 {
        // export the data in the format name length data
-       uint32 outSize = 2 * sizeof (uint32) + mValue.length ();
+       size_t outSize = 2 * sizeof (uint32) + mValue.length ();
        unsigned char* d = (unsigned char*) malloc(outSize);
        unsigned char* finger = d;
        
@@ -104,7 +104,7 @@ void NameValuePair::Export (CssmData &data) const
        
        // export the length
        finger += sizeof (uint32);
-       intBuffer = mValue.length ();
+       intBuffer = (uint32)mValue.length ();
        for (i = sizeof (uint32) - 1; i >= 0; --i)
        {
                finger[i] = intBuffer & 0xFF;
@@ -129,7 +129,7 @@ NameValueDictionary::NameValueDictionary ()
 NameValueDictionary::~NameValueDictionary ()
 {
        // to prevent leaks, delete all members of the vector
-       int i = mVector.size ();
+       size_t i = mVector.size ();
        while (i > 0)
        {
                delete mVector[--i];
@@ -258,7 +258,7 @@ const NameValuePair* NameValueDictionary::FindByName (uint32 name) const
 
 int NameValueDictionary::CountElements () const
 {
-       return mVector.size ();
+       return (int)mVector.size ();
 }