From f4b519ae12999d1200bf232986debb06b02ca444 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Mon, 11 Mar 2013 13:53:48 +0100
Subject: Add -Wextra and use gnu99

---
 Makefile    |  4 ++--
 econproxy.c | 12 ++++++++----
 econserv.c  |  4 ++--
 util.c      |  2 +-
 4 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 934f70a..14ba08d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,9 @@
-CFLAGS=-ggdb -Wall -Wstrict-prototypes -Wmissing-prototypes
+CFLAGS=-std=gnu99 -ggdb -Wall -Wstrict-prototypes -Wmissing-prototypes -Wunused-result -Wextra -pedantic
 
 all: econproxy econserv
 
 %: %.c util.c util.h econproto.h
-	gcc $(CFLAGS) -Wall -o $@ $< util.c
+	gcc $(CFLAGS) -o $@ $< util.c
 
 clean:
 	rm -f econproxy econserv
diff --git a/econproxy.c b/econproxy.c
index 2f20a49..93935dd 100644
--- a/econproxy.c
+++ b/econproxy.c
@@ -122,13 +122,15 @@ econ_send_packet(struct ep *ep)
 static int
 econ_read_packet(struct ep *ep)
 {
-	ssize_t len;
+	ssize_t r;
+	size_t len;
 
 	init_iov(ep);
 
-	len = readv(ep->ec_fd, ep->iov, 3);
-	if (len < 0)
+	r = readv(ep->ec_fd, ep->iov, 3);
+	if (r < 0)
 		return -1;
+	len = (size_t) r;
 
 	if (len < sizeof(struct econ_header)) {
 		fprintf(stderr, "econ_read_packet: error: incomplete header\n");
@@ -551,7 +553,7 @@ rfb_retrieve_framebuffer_update(struct ep *ep,
 		datasize += size;
 
 		len = loop_read(ep->vnc_fd, data, size, 0);
-		if (len < 0 || len != size)
+		if (len < 0 || (size_t) len != size)
 			goto err;
 
 	}
@@ -585,7 +587,9 @@ rfb_init(struct ep *ep)
 		rfbServerInitMsg msg;
 		struct {
 			rfbServerInitMsg msg;
+#if 0
 			char name[0];
+#endif
 		} d;
 		char buf[BUFSIZ];
 	} init;
diff --git a/econserv.c b/econserv.c
index 3d0f130..2cd6959 100644
--- a/econserv.c
+++ b/econserv.c
@@ -227,7 +227,7 @@ handle_input(struct ecs *ecs, char *in, int fd,
 			in.sin_addr.s_addr = ((struct sockaddr_in *) src_addr)->sin_addr.s_addr;
 			printf("got connect request\n");
 			if (connect(ecs->client_fd, (struct sockaddr *) &in, sizeof in) != 0) {
-				fprintf(stderr, "failed to connect: %m\n");
+				fprintf(stderr, "failed to connect: %s\n", strerror(errno));
 				close(ecs->client_fd);
 				ecs->client_fd = -1;
 				ecs->state = E_PSTAT_NOUSE;
@@ -378,7 +378,7 @@ int main(int argc, char *argv[])
 		}
 
 		if (select(maxfd + 1, &fds, NULL, NULL, NULL) <= 0) {
-			fprintf(stderr, "select failed: %m");
+			fprintf(stderr, "select failed: %s", strerror(errno));
 			continue;
 		}
 
diff --git a/util.c b/util.c
index 185eed1..2d39a82 100644
--- a/util.c
+++ b/util.c
@@ -52,7 +52,7 @@ sock_get_ifreq(int fd)
 	static struct ifreq ifreqs[16];
 	struct sockaddr_in *sin;
 	uint32_t own_ip;
-	int i;
+	unsigned int i;
 
 	own_ip = sock_get_ipv4_addr(fd);
 
-- 
cgit