Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_utilities / lib / fdmover.cpp

diff --git a/libsecurity_utilities/lib/fdmover.cpp b/libsecurity_utilities/lib/fdmover.cpp
index 2f23a6ce9ec6d33d14612c81ae1d058ba43e4e12..4e1713f846d103c0e613d6c490adcb8b3b5b1f81 100644 (file)
--- a/libsecurity_utilities/lib/fdmover.cpp
+++ b/libsecurity_utilities/lib/fdmover.cpp
@@ -37,7 +37,7 @@ namespace IPPlusPlus {
 void *FdMover::Element::operator new (size_t base, size_t more)
 {
        Element *element = (Element *)::malloc(CMSG_SPACE(more));
 void *FdMover::Element::operator new (size_t base, size_t more)
 {
        Element *element = (Element *)::malloc(CMSG_SPACE(more));

-       element->cmsg_len = CMSG_LEN(more);
+       element->cmsg_len = (socklen_t)CMSG_LEN(more);

        return element;
 }
 
        return element;
 }
 


@@ -92,7 +92,7 @@ size_t FdMover::receive(void *data, size_t length, FdVector &fds)
        msg.set(elem.get());
        ssize_t rc = ::recvmsg(fd(), &msg, 0);
        checkError(rc);
        msg.set(elem.get());
        ssize_t rc = ::recvmsg(fd(), &msg, 0);
        checkError(rc);

-       unsigned count = elem.get()->payloadSize() / sizeof(int);
+       size_t count = elem.get()->payloadSize() / sizeof(int);

        FdVector result;
        copy(&elem.get()->payload<int>(), &elem.get()->payload<int>() + count, back_inserter(result));
        swap(fds, result);
        FdVector result;
        copy(&elem.get()->payload<int>(), &elem.get()->payload<int>() + count, back_inserter(result));
        swap(fds, result);