aboutsummaryrefslogtreecommitdiffstats
path: root/socket.c
diff options
context:
space:
mode:
authorMatthias Andree <matthias.andree@gmx.de>2009-01-14 01:56:15 +0000
committerMatthias Andree <matthias.andree@gmx.de>2009-01-14 01:56:15 +0000
commitaf7d73c7ab76ad81fed78b7f5c024daf1af87d9d (patch)
tree9edb72176a3491b5d10e48b9570aca071fdba731 /socket.c
parenta804c2b676aa9629bea657e78d5e6803b85228cc (diff)
downloadfetchmail-af7d73c7ab76ad81fed78b7f5c024daf1af87d9d.tar.gz
fetchmail-af7d73c7ab76ad81fed78b7f5c024daf1af87d9d.tar.bz2
fetchmail-af7d73c7ab76ad81fed78b7f5c024daf1af87d9d.zip
Fix a few compiler warnings around implicit conversion or extra ";".
svn path=/branches/BRANCH_6-3/; revision=5261
Diffstat (limited to 'socket.c')
-rw-r--r--socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/socket.c b/socket.c
index f0691b97..3a03a6eb 100644
--- a/socket.c
+++ b/socket.c
@@ -468,7 +468,7 @@ int SockRead(int sock, char *buf, int len)
* We don't have a string to pass through
* the strchr at this point yet */
newline = NULL;
- } else if ((newline = memchr(bp, '\n', n)) != NULL)
+ } else if ((newline = (char *)memchr(bp, '\n', n)) != NULL)
n = newline - bp + 1;
/* Matthias Andree: SSL_read can return 0, in that case
* we must call SSL_get_error to figure if there was
@@ -638,7 +638,7 @@ static int SSL_verify_callback( int ok_return, X509_STORE_CTX *ctx, int strict )
/* RFC 2595 section 2.4: find a matching name
* first find a match among alternative names */
- gens = X509_get_ext_d2i(x509_cert, NID_subject_alt_name, NULL, NULL);
+ gens = (STACK_OF(GENERAL_NAME) *)X509_get_ext_d2i(x509_cert, NID_subject_alt_name, NULL, NULL);
if (gens) {
int i, r;
for (i = 0, r = sk_GENERAL_NAME_num(gens); i < r; ++i) {