diff options
| author | Nick Zitzmann <nick@chronosnet.com> | 2012-12-11 21:43:48 -0700 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-12-14 23:33:10 +0100 |
| commit | bbb4bbc0f1628b326636dd0a4df22a829fcdbe39 (patch) | |
| tree | 8fcff1a4f0d5c5a2116dc75081d6252cb39677d8 /lib | |
| parent | 0e8e340cba34837f89f393ec71bdaed2a4a02bf8 (diff) | |
darwinssl: Fix implicit conversion compiler warnings
The Clang compiler found a few implicit conversion problems that have
now been fixed.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/curl_darwinssl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/curl_darwinssl.c b/lib/curl_darwinssl.c index 8ea190ac8..40d4870ad 100644 --- a/lib/curl_darwinssl.c +++ b/lib/curl_darwinssl.c @@ -75,15 +75,15 @@ static OSStatus SocketRead(SSLConnectionRef connection, * RETURNED */ size_t *dataLength) /* IN/OUT */ { - UInt32 bytesToGo = *dataLength; - UInt32 initLen = bytesToGo; + size_t bytesToGo = *dataLength; + size_t initLen = bytesToGo; UInt8 *currData = (UInt8 *)data; /*int sock = *(int *)connection;*/ struct ssl_connect_data *connssl = (struct ssl_connect_data *)connection; int sock = connssl->ssl_sockfd; OSStatus rtn = noErr; - UInt32 bytesRead; - int rrtn; + size_t bytesRead; + ssize_t rrtn; int theErr; *dataLength = 0; @@ -137,12 +137,12 @@ static OSStatus SocketWrite(SSLConnectionRef connection, const void *data, size_t *dataLength) /* IN/OUT */ { - UInt32 bytesSent = 0; + size_t bytesSent = 0; /*int sock = *(int *)connection;*/ struct ssl_connect_data *connssl = (struct ssl_connect_data *)connection; int sock = connssl->ssl_sockfd; - int length; - UInt32 dataLen = *dataLength; + ssize_t length; + size_t dataLen = *dataLength; const UInt8 *dataPtr = (UInt8 *)data; OSStatus ortn; int theErr; @@ -1327,7 +1327,7 @@ void Curl_darwinssl_md5sum(unsigned char *tmp, /* input */ size_t md5len) { (void)md5len; - (void)CC_MD5(tmp, tmplen, md5sum); + (void)CC_MD5(tmp, (CC_LONG)tmplen, md5sum); } static ssize_t darwinssl_send(struct connectdata *conn, |