From fb7c9e563310fe1b7f1517250d64b4284182b085 Mon Sep 17 00:00:00 2001
From: Andrew Bettison <andrewb@zip.com.au>
Date: Thu, 27 Sep 2012 11:02:58 +0930
Subject: [PATCH] Fix compiler warnings on Linux gcc 4.7.1

---
 overlay_interface.c |  3 ++-
 overlay_mdp.c       | 16 ++++++----------
 server.c            |  3 ++-
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/overlay_interface.c b/overlay_interface.c
index fa32507b..258dfe8e 100644
--- a/overlay_interface.c
+++ b/overlay_interface.c
@@ -944,7 +944,7 @@ overlay_queue_remove(overlay_txqueue *queue, struct overlay_frame *frame){
   return next;
 }
 
-/* XXX: unused */
+#if 0 /* unused */
 static int
 overlay_queue_dump(overlay_txqueue *q)
 {
@@ -977,6 +977,7 @@ overlay_queue_dump(overlay_txqueue *q)
   DEBUG(strbuf_str(b));
   return 0;
 }
+#endif // 0
 
 static void
 overlay_init_packet(struct outgoing_packet *packet, overlay_interface *interface, int tick){
diff --git a/overlay_mdp.c b/overlay_mdp.c
index 965577f9..571104ca 100644
--- a/overlay_mdp.c
+++ b/overlay_mdp.c
@@ -208,29 +208,25 @@ int overlay_mdp_process_bind_request(int sock, struct subscriber *subscriber, in
   }
 
   /* See if binding already exists */
-  int found=-1;
+  int found=-1; // XXX: this is never set, why is it here?
   int free=-1;
   for(i=0;i<MDP_MAX_BINDINGS;i++) {
     /* Look for duplicate bindings */
-    if (mdp_bindings[i].port == port && 
-	mdp_bindings[i].subscriber == subscriber){
-      
-      if (mdp_bindings[found].name_len==recvaddrlen &&
-	  !memcmp(mdp_bindings[found].socket_name,recvaddr->sun_path,recvaddrlen)){
+    if (mdp_bindings[i].port == port && mdp_bindings[i].subscriber == subscriber) {
+      if (found != -1 &&
+	  mdp_bindings[found].name_len==recvaddrlen &&
+	  !memcmp(mdp_bindings[found].socket_name,recvaddr->sun_path,recvaddrlen)) {
 	// this client already owns this port binding?
 	INFO("Identical binding exists");
 	return 0;
-	
       }else if(flags&MDP_FORCE){
 	// steal the port binding
-	free=i; 
+	free=i;
 	break;
-	
       }else{
 	return WHY("Port already in use");
       }
     }
-    
     /* Look for free slots in case we need one */
     if ((free==-1)&&(mdp_bindings[i].port==0)) free=i;
   }
diff --git a/server.c b/server.c
index 983f9755..d23c17ea 100644
--- a/server.c
+++ b/server.c
@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 #include <signal.h>
 #include <unistd.h>
+#include <time.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <sys/stat.h>
@@ -479,7 +480,7 @@ int processRequest(unsigned char *packet,int len,
 	if (instrumentation_file)
 	  {
 	    if (!i_f) { if (strcmp(instrumentation_file,"-")) i_f=fopen(instrumentation_file,"a"); else i_f=stdout; }
-	    if (i_f) fprintf(i_f,"%ld:%02x%02x%02x%02x:%d:%d\n",time(0),sender->sa_data[0],sender->sa_data[1],sender->sa_data[2],sender->sa_data[3],field,value);
+	    if (i_f) fprintf(i_f,"%ld:%02x%02x%02x%02x:%d:%d\n",(long)time(0),sender->sa_data[0],sender->sa_data[1],sender->sa_data[2],sender->sa_data[3],field,value);
 	    if (i_f) fflush(i_f);
 	  }
       }