From a1db79b31a506df3e6fb082dd59f3c8d37a8ac7e Mon Sep 17 00:00:00 2001
From: Martin Willi <martin@strongswan.org>
Date: Mon, 27 Oct 2008 11:13:33 +0000
Subject: [PATCH] fixed some compiler warnings

---
 src/charon/bus/listeners/file_logger.c    | 1 -
 src/charon/config/traffic_selector.c      | 5 +++++
 src/charon/plugins/stroke/stroke_config.c | 1 +
 src/charon/plugins/updown/updown_plugin.c | 3 +++
 src/charon/sa/task_manager.c              | 2 --
 src/dumm/mconsole.c                       | 8 ++------
 6 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/charon/bus/listeners/file_logger.c b/src/charon/bus/listeners/file_logger.c
index 82d5c274e..9ce8397b3 100644
--- a/src/charon/bus/listeners/file_logger.c
+++ b/src/charon/bus/listeners/file_logger.c
@@ -106,7 +106,6 @@ static void destroy(private_file_logger_t *this)
  */
 file_logger_t *file_logger_create(FILE *out)
 {
-	debug_t group;
 	private_file_logger_t *this = malloc_thing(private_file_logger_t);
 	
 	/* public functions */
diff --git a/src/charon/config/traffic_selector.c b/src/charon/config/traffic_selector.c
index b94003cfb..b8790470a 100644
--- a/src/charon/config/traffic_selector.c
+++ b/src/charon/config/traffic_selector.c
@@ -612,6 +612,11 @@ static void to_subnet(private_traffic_selector_t *this, host_t **net, u_int8_t *
 			net_chunk.len = sizeof(this->from6);
 			break;
 		}
+		default:
+		{
+			/* unreachable */
+			return;
+		}
 	}
 	
 	net_chunk.ptr = malloc(net_chunk.len);
diff --git a/src/charon/plugins/stroke/stroke_config.c b/src/charon/plugins/stroke/stroke_config.c
index f10fe2051..d339f2698 100644
--- a/src/charon/plugins/stroke/stroke_config.c
+++ b/src/charon/plugins/stroke/stroke_config.c
@@ -19,6 +19,7 @@
 
 #include <daemon.h>
 #include <utils/mutex.h>
+#include <utils/lexparser.h>
 
 typedef struct private_stroke_config_t private_stroke_config_t;
 
diff --git a/src/charon/plugins/updown/updown_plugin.c b/src/charon/plugins/updown/updown_plugin.c
index 0e054cab6..a0c39e371 100644
--- a/src/charon/plugins/updown/updown_plugin.c
+++ b/src/charon/plugins/updown/updown_plugin.c
@@ -15,6 +15,9 @@
  * $Id$
  */
 
+#define _GNU_SOURCE
+#include <stdio.h>
+
 #include "updown_plugin.h"
 
 #include <daemon.h>
diff --git a/src/charon/sa/task_manager.c b/src/charon/sa/task_manager.c
index 02cb62cff..4006a8cd5 100644
--- a/src/charon/sa/task_manager.c
+++ b/src/charon/sa/task_manager.c
@@ -145,8 +145,6 @@ struct private_task_manager_t {
  */
 static void flush(private_task_manager_t *this)
 {
-	task_t *task;
-	
 	this->queued_tasks->destroy_offset(this->queued_tasks, 
 										offsetof(task_t, destroy));
 	this->passive_tasks->destroy_offset(this->passive_tasks,
diff --git a/src/dumm/mconsole.c b/src/dumm/mconsole.c
index 85c090e27..f071ad47f 100644
--- a/src/dumm/mconsole.c
+++ b/src/dumm/mconsole.c
@@ -207,7 +207,7 @@ static int exec(private_mconsole_t *this, void(*cb)(void*,char*,size_t),
 /**
  * Poll until guest is ready
  */
-static bool wait_bootup(private_mconsole_t *this)
+static void wait_bootup(private_mconsole_t *this)
 {
 	/* wait for init process to appear */
 	while (request(this, ignore, NULL, "exec ps -p 1 > /dev/null"))
@@ -346,11 +346,7 @@ mconsole_t *mconsole_create(char *notify, void(*idle)(void))
 	}
 	unlink(notify);
 	
-	if (!wait_bootup(this))
-	{
-		destroy(this);
-		return NULL;
-	}
+	wait_bootup(this);
 	
 	return &this->public;
 }