# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1141822389 0
# Node ID e109fb08b8ee74e13ec686969ecda64f39db889c
# Parent  3cea9d789ccae83fe1107695494e05d9e12dabc6# Parent  7f9adaf85fca7f07126b97a101e352c576c7239e
merge of 4cbdd6e0a0d8c061075b9ed7609a06c4547f67d3
     and 5d396842815593611f0d61762440145d1fc74d5a

diff -r 7f9adaf85fca -r e109fb08b8ee common-channel.c
--- a/common-channel.c	Sat Mar 04 08:22:16 2006 +0000
+++ b/common-channel.c	Wed Mar 08 12:53:09 2006 +0000
@@ -181,7 +181,6 @@
 
 	struct Channel *channel;
 	unsigned int i;
-	int ret;
 
 	/* iterate through all the possible channels */
 	for (i = 0; i < ses.chansize; i++) {
diff -r 7f9adaf85fca -r e109fb08b8ee rsa.c
--- a/rsa.c	Sat Mar 04 08:22:16 2006 +0000
+++ b/rsa.c	Wed Mar 08 12:53:09 2006 +0000
@@ -264,7 +264,6 @@
 	DEF_MP_INT(rsa_tmp1);
 	DEF_MP_INT(rsa_tmp2);
 	DEF_MP_INT(rsa_tmp3);
-	unsigned char *tmpbuf;
 	
 	TRACE(("enter buf_put_rsa_sign"))
 	dropbear_assert(key != NULL);
diff -r 7f9adaf85fca -r e109fb08b8ee tcp-accept.c
--- a/tcp-accept.c	Sat Mar 04 08:22:16 2006 +0000
+++ b/tcp-accept.c	Wed Mar 08 12:53:09 2006 +0000
@@ -47,7 +47,7 @@
 
 	int fd;
 	struct sockaddr_storage addr;
-	int len;
+	socklen_t len;
 	char ipstring[NI_MAXHOST], portstring[NI_MAXSERV];
 	struct TCPListener *tcpinfo = (struct TCPListener*)(listener->typedata);