summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeoff Thorpe <geoff@openssl.org>2000-02-25 15:09:04 +0000
committerGeoff Thorpe <geoff@openssl.org>2000-02-25 15:09:04 +0000
commit4621a000630afc0b9522576c6ffb0f3975ed16ff (patch)
treecaeb473418d700a0bab1848d277eab83b0ac2c13
parent7dce5a727a8aaab010e071f3689240b79c40eae6 (diff)
More VC++ pickiness. (destest.c doesn't have a "return" and the usual
signed/unsigned stuff in s3_pkt.c) Submitted by: Reviewed by: PR:
-rw-r--r--crypto/des/destest.c1
-rw-r--r--ssl/s3_pkt.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 46c517be13..98f373008f 100644
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -796,6 +796,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
}
printf("\n");
exit(err);
+ return(err); /* Never reached, but keeps compilers happy */
}
static char *pt(unsigned char *p)
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index 579058e0f2..6d9dad9040 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -706,8 +706,8 @@ static int ssl3_write_pending(SSL *s, int type, const unsigned char *buf,
*/
int ssl3_read_bytes(SSL *s, int type, unsigned char *buf, int len)
{
- int al,i,j,ret;
- unsigned int n;
+ int al,j,ret;
+ unsigned int i,n;
SSL3_RECORD *rr;
void (*cb)()=NULL;