From f41d8d6b14e00abd54c1470ac1764e0ce00a53f5 Mon Sep 17 00:00:00 2001
From: Christian Helmuth <christian.helmuth@genode-labs.com>
Date: Tue, 2 May 2017 16:55:08 +0200
Subject: [PATCH] core: fix compiler warnings

---
 repos/base-foc/src/core/include/map_local.h | 7 ++++---
 repos/base-foc/src/lib/base/ipc.cc          | 2 --
 repos/base/src/core/pager_ep.cc             | 5 +++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/repos/base-foc/src/core/include/map_local.h b/repos/base-foc/src/core/include/map_local.h
index 9a243dbd9b..a6fdb34253 100644
--- a/repos/base-foc/src/core/include/map_local.h
+++ b/repos/base-foc/src/core/include/map_local.h
@@ -124,11 +124,11 @@ namespace Genode {
 	}
 
 
-	static inline void unmap_local(addr_t local_base, size_t num_pages)
+	static inline void unmap_local(addr_t const local_base, size_t const num_pages)
 	{
 		using namespace Fiasco;
 
-		size_t size = num_pages << get_page_size_log2();
+		size_t const size = num_pages << get_page_size_log2();
 		addr_t addr = local_base;
 
 		/*
@@ -138,7 +138,8 @@ namespace Genode {
 			l4_task_unmap(L4_BASE_TASK_CAP,
 			              l4_fpage(addr, L4_LOG2_PAGESIZE, L4_FPAGE_RW),
 			              L4_FP_OTHER_SPACES);
-			l4_cache_dma_coherent(local_base, local_base + size);
+
+		l4_cache_dma_coherent(local_base, local_base + size);
 	}
 }
 
diff --git a/repos/base-foc/src/lib/base/ipc.cc b/repos/base-foc/src/lib/base/ipc.cc
index ab8e10027b..4666120b02 100644
--- a/repos/base-foc/src/lib/base/ipc.cc
+++ b/repos/base-foc/src/lib/base/ipc.cc
@@ -242,8 +242,6 @@ static l4_msgtag_t copy_msgbuf_to_utcb(Msgbuf_base &snd_msg,
 
 	for (unsigned i = 0; i < num_caps; i++) {
 
-		Native_capability const &cap = snd_msg.cap(i);
-
 		/* store badge as normal message word */
 		*msg_words++ = caps[i].valid ? caps[i].badge : INVALID_BADGE;
 
diff --git a/repos/base/src/core/pager_ep.cc b/repos/base/src/core/pager_ep.cc
index f9ede9f197..e1dfc113e1 100644
--- a/repos/base/src/core/pager_ep.cc
+++ b/repos/base/src/core/pager_ep.cc
@@ -35,15 +35,16 @@ void Pager_entrypoint::entry()
 
 		Pool::apply(_pager.badge(), [&] (Pager_object *obj) {
 			if (obj) {
-				if (_pager.exception())
+				if (_pager.exception()) {
 					obj->submit_exception_signal();
-				else
+				} else {
 					/* send reply if page-fault handling succeeded */
 					reply_pending = !obj->pager(_pager);
 					if (!reply_pending)
 						warning("page-fault, ", *obj,
 						        " ip=", Hex(_pager.fault_ip()),
 						        " pf-addr=", Hex(_pager.fault_addr()));
+				}
 			} else {
 
 				/*