From 591bc3f2d99168a9b2a9bdcbda20c47e97a4ff80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Duval?= <korli@users.berlios.de>
Date: Thu, 28 May 2009 20:36:22 +0000
Subject: [PATCH] * various fixes identified by gcc4, provided by Joe Prostko

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30902 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 src/add-ons/kernel/file_systems/ntfs/libntfs/logging.c | 10 +++++-----
 src/kits/interface/Window.cpp                          |  2 +-
 src/system/kernel/cache/block_cache.cpp                |  3 +++
 src/system/kernel/device_manager/IOScheduler.cpp       |  3 +++
 src/system/kernel/slab/Slab.cpp                        |  3 +++
 src/system/kernel/thread.cpp                           |  3 +++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/add-ons/kernel/file_systems/ntfs/libntfs/logging.c b/src/add-ons/kernel/file_systems/ntfs/libntfs/logging.c
index 743794e8f0..0b0485fa61 100644
--- a/src/add-ons/kernel/file_systems/ntfs/libntfs/logging.c
+++ b/src/add-ons/kernel/file_systems/ntfs/libntfs/logging.c
@@ -197,7 +197,7 @@ static FILE * ntfs_log_get_stream(u32 level)
 {
 #if defined(__BEOS__) || defined(__HAIKU__)
 	return NULL;
-#elif
+#else
 	FILE *stream;
 
 	switch (level) {
@@ -407,7 +407,7 @@ int ntfs_log_handler_fprintf(const char *function, const char *file,
 {
 #if defined(__BEOS__) || defined(__HAIKU__)
 	return 0;
-#elif
+#else
 	int ret = 0;
 	int olderr = errno;
 	FILE *stream;
@@ -528,7 +528,7 @@ int ntfs_log_handler_stdout(const char *function, const char *file,
 {
 #if defined(__BEOS__) || defined(__HAIKU__)
 	return 0;
-#elif
+#else
 	if (!data)
 		data = stdout;
 
@@ -563,7 +563,7 @@ int ntfs_log_handler_outerr(const char *function, const char *file,
 {
 #if defined(__BEOS__) || defined(__HAIKU__)
 	return 0;
-#elif
+#else
 	if (!data)
 		data = ntfs_log_get_stream(level);
 
@@ -597,7 +597,7 @@ int ntfs_log_handler_stderr(const char *function, const char *file,
 {
 #if defined(__BEOS__) || defined(__HAIKU__)
 	return 0;
-#elif
+#else
 	if (!data)
 		data = stderr;
 
diff --git a/src/kits/interface/Window.cpp b/src/kits/interface/Window.cpp
index a5b4176cad..54c183c99b 100644
--- a/src/kits/interface/Window.cpp
+++ b/src/kits/interface/Window.cpp
@@ -3399,7 +3399,7 @@ BWindow::_HandleKeyDown(BMessage* event)
 
 			be_roster->Launch("application/x-vnd.haiku-screenshot", &message);
 			return true;
-#elif
+#else
 			// Get filename
 			BPath homePath;
 
diff --git a/src/system/kernel/cache/block_cache.cpp b/src/system/kernel/cache/block_cache.cpp
index 74dd1fe9ef..0c713eb9d7 100644
--- a/src/system/kernel/cache/block_cache.cpp
+++ b/src/system/kernel/cache/block_cache.cpp
@@ -1947,6 +1947,9 @@ block_notifier_and_writer(void* /*data*/)
 			}
 		}
 	}
+
+	// never can get here
+	return B_OK;
 }
 
 
diff --git a/src/system/kernel/device_manager/IOScheduler.cpp b/src/system/kernel/device_manager/IOScheduler.cpp
index f9c96905c1..045b12654a 100644
--- a/src/system/kernel/device_manager/IOScheduler.cpp
+++ b/src/system/kernel/device_manager/IOScheduler.cpp
@@ -739,6 +739,9 @@ IOScheduler::_RequestNotifier()
 		// notify the request
 		request->NotifyFinished();
 	}
+
+	// never can get here
+	return B_OK;
 }
 
 
diff --git a/src/system/kernel/slab/Slab.cpp b/src/system/kernel/slab/Slab.cpp
index 6fa7c21c7b..7ce3d78c23 100644
--- a/src/system/kernel/slab/Slab.cpp
+++ b/src/system/kernel/slab/Slab.cpp
@@ -756,6 +756,9 @@ object_cache_resizer(void*)
 		if (request->delete_when_done)
 			delete request;
 	}
+
+	// never can get here
+	return B_OK;
 }
 
 
diff --git a/src/system/kernel/thread.cpp b/src/system/kernel/thread.cpp
index 7506b801e8..dd10273386 100644
--- a/src/system/kernel/thread.cpp
+++ b/src/system/kernel/thread.cpp
@@ -632,6 +632,9 @@ undertaker(void* /*args*/)
 		thread_enqueue(thread, &dead_q);
 			// TODO: Use the slab allocator!
 	}
+
+	// never can get here
+	return B_OK;
 }