changeset 1034:107b013e9d9d fastopen

avoid some warnings
author Matt Johnston <matt@ucc.asn.au>
date Fri, 20 Feb 2015 23:43:59 +0800 (2015-02-20)
parents ca71904cf3ee
children 8ed1d37e75a6
files netio.c
diffstat 1 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/netio.c	Fri Feb 20 23:38:05 2015 +0800
+++ b/netio.c	Fri Feb 20 23:43:59 2015 +0800
@@ -274,7 +274,7 @@
 struct iovec * packet_queue_to_iovec(struct Queue *queue, int *ret_iov_count) {
 	struct iovec *iov = NULL;
 	struct Link *l;
-	unsigned int i, packet_type;
+	unsigned int i;
 	int len;
 	buffer *writebuf;
 
@@ -288,10 +288,9 @@
 	for (l = queue->head, i = 0; l; l = l->link, i++)
 	{
 		writebuf = (buffer*)l->item;
-		packet_type = writebuf->data[writebuf->len-1];
 		len = writebuf->len - 1 - writebuf->pos;
 		dropbear_assert(len > 0);
-		TRACE2(("write_packet writev #%d  type %d len %d/%d", i, packet_type,
+		TRACE2(("write_packet writev #%d  type %d len %d/%d", i, writebuf->data[writebuf->len-1],
 				len, writebuf->len-1))
 		iov[i].iov_base = buf_getptr(writebuf, len);
 		iov[i].iov_len = len;
@@ -338,7 +337,14 @@
 
 void set_sock_priority(int sock, enum dropbear_prio prio) {
 
-	int iptos_val = 0, so_prio_val = 0, rc;
+	int rc;
+#ifdef IPTOS_LOWDELAY
+	int iptos_val = 0;
+#endif
+#ifdef SO_PRIORITY
+	int so_prio_val = 0;
+#endif
+
 
 	/* Don't log ENOTSOCK errors so that this can harmlessly be called
 	 * on a client '-J' proxy pipe */