mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
darwin: silence compiler warnings
With a clang pragma and three type fixes Fixes #1722
This commit is contained in:
parent
6f6cfc90be
commit
af271ce9b9
@ -34,6 +34,11 @@
|
||||
|
||||
#ifdef USE_DARWINSSL
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic push
|
||||
#pragma clang diagnostic ignored "-Wtautological-pointer-compare"
|
||||
#endif __clang__
|
||||
|
||||
#ifdef HAVE_LIMITS_H
|
||||
#include <limits.h>
|
||||
#endif
|
||||
@ -2033,7 +2038,8 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data,
|
||||
const char *pinnedpubkey)
|
||||
{ /* Scratch */
|
||||
size_t pubkeylen, realpubkeylen, spkiHeaderLength = 24;
|
||||
unsigned char *pubkey = NULL, *realpubkey = NULL, *spkiHeader = NULL;
|
||||
unsigned char *pubkey = NULL, *realpubkey = NULL;
|
||||
const unsigned char *spkiHeader = NULL;
|
||||
CFDataRef publicKeyBits = NULL;
|
||||
|
||||
/* Result is returned to caller */
|
||||
@ -2076,7 +2082,7 @@ static CURLcode pkp_pin_peer_pubkey(struct Curl_easy *data,
|
||||
#endif /* DARWIN_SSL_PINNEDPUBKEY_V2 */
|
||||
|
||||
pubkeylen = CFDataGetLength(publicKeyBits);
|
||||
pubkey = CFDataGetBytePtr(publicKeyBits);
|
||||
pubkey = (unsigned char *)CFDataGetBytePtr(publicKeyBits);
|
||||
|
||||
switch(pubkeylen) {
|
||||
case 526:
|
||||
@ -2845,4 +2851,8 @@ static ssize_t darwinssl_recv(struct connectdata *conn,
|
||||
return (ssize_t)processed;
|
||||
}
|
||||
|
||||
#ifdef __clang__
|
||||
#pragma clang diagnostic pop
|
||||
#endif
|
||||
|
||||
#endif /* USE_DARWINSSL */
|
||||
|
Loading…
Reference in New Issue
Block a user