Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_keychain / libDER / libDERUtils / fileIo.c

diff --git a/libsecurity_keychain/libDER/libDERUtils/fileIo.c b/libsecurity_keychain/libDER/libDERUtils/fileIo.c
index 078df72d1bb9e786d4444a1fc3c1e6341a6677b9..fec82702201cba9488fdc4ad3c7fc9312bf3495c 100644 (file)
--- a/libsecurity_keychain/libDER/libDERUtils/fileIo.c
+++ b/libsecurity_keychain/libDER/libDERUtils/fileIo.c
@@ -23,7 +23,7 @@ int writeFile(
        if(fd <= 0) {
                return errno;
        }
        if(fd <= 0) {
                return errno;
        }

-       rtn = write(fd, bytes, (size_t)numBytes);
+       rtn = (int)write(fd, bytes, (size_t)numBytes);

        if(rtn != (int)numBytes) {
                if(rtn >= 0) {
                        fprintf(stderr, "writeFile: short write\n");
        if(rtn != (int)numBytes) {
                if(rtn >= 0) {
                        fprintf(stderr, "writeFile: short write\n");


@@ -49,7 +49,7 @@ int readFile(
        int fd;
        char *buf;
        struct stat     sb;
        int fd;
        char *buf;
        struct stat     sb;

-       size_t size;
+       unsigned size;

        
        *numBytes = 0;
        *bytes = NULL;
        
        *numBytes = 0;
        *bytes = NULL;


@@ -61,14 +61,14 @@ int readFile(
        if(rtn) {
                goto errOut;
        }
        if(rtn) {
                goto errOut;
        }

-       size = (size_t) sb.st_size;
+       size = (unsigned) sb.st_size;

        buf = (char *)malloc(size);
        if(buf == NULL) {
                rtn = ENOMEM;
                goto errOut;
        }
        buf = (char *)malloc(size);
        if(buf == NULL) {
                rtn = ENOMEM;
                goto errOut;
        }

-       rtn = read(fd, buf, (size_t)size);
-       if(rtn != (int)size) {
+       rtn = (int)read(fd, buf, size);
+       if(rtn != size) {

                if(rtn >= 0) {
                        fprintf(stderr, "readFile: short read\n");
                }
                if(rtn >= 0) {
                        fprintf(stderr, "readFile: short read\n");
                }