From 6f4d6cb5741d10e10dacc78e264e421bf6a297cf Mon Sep 17 00:00:00 2001
From: ShadowNinja <shadowninja@minetest.net>
Date: Wed, 14 Oct 2015 02:33:04 -0400
Subject: Always use errorstream for DEBUG_EXCEPTION_HANDLER

---
 src/debug.h                | 12 ++++++------
 src/emerge.cpp             |  2 +-
 src/httpfetch.cpp          |  2 +-
 src/main.cpp               |  2 +-
 src/network/connection.cpp |  4 ++--
 src/server.cpp             |  2 +-
 src/util/thread.h          |  2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/debug.h b/src/debug.h
index 94b268edd..e8d35ba70 100644
--- a/src/debug.h
+++ b/src/debug.h
@@ -126,16 +126,16 @@ private:
 
 #if CATCH_UNHANDLED_EXCEPTIONS == 1
 	#define BEGIN_DEBUG_EXCEPTION_HANDLER try {
-	#define END_DEBUG_EXCEPTION_HANDLER(logstream)           \
-		} catch (std::exception &e) {                        \
-			logstream << "An unhandled exception occurred: " \
-				<< e.what() << std::endl;                    \
-			FATAL_ERROR(e.what());                           \
+	#define END_DEBUG_EXCEPTION_HANDLER                        \
+		} catch (std::exception &e) {                          \
+			errorstream << "An unhandled exception occurred: " \
+				<< e.what() << std::endl;                      \
+			FATAL_ERROR(e.what());                             \
 		}
 #else
 	// Dummy ones
 	#define BEGIN_DEBUG_EXCEPTION_HANDLER
-	#define END_DEBUG_EXCEPTION_HANDLER(logstream)
+	#define END_DEBUG_EXCEPTION_HANDLER
 #endif
 
 #endif // DEBUG_HEADER
diff --git a/src/emerge.cpp b/src/emerge.cpp
index 3532ca29d..1e40b915a 100644
--- a/src/emerge.cpp
+++ b/src/emerge.cpp
@@ -700,6 +700,6 @@ void *EmergeThread::run()
 		m_server->setAsyncFatalError(err.str());
 	}
 
-	END_DEBUG_EXCEPTION_HANDLER(errorstream)
+	END_DEBUG_EXCEPTION_HANDLER
 	return NULL;
 }
diff --git a/src/httpfetch.cpp b/src/httpfetch.cpp
index 6040b1b3b..979f11160 100644
--- a/src/httpfetch.cpp
+++ b/src/httpfetch.cpp
@@ -677,7 +677,7 @@ protected:
 			else
 				waitForIO(100);
 
-			END_DEBUG_EXCEPTION_HANDLER(errorstream)
+			END_DEBUG_EXCEPTION_HANDLER
 		}
 
 		// Call curl_multi_remove_handle and cleanup easy handles
diff --git a/src/main.cpp b/src/main.cpp
index cc8b4bcaa..53f8a1fb7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -226,7 +226,7 @@ int main(int argc, char *argv[])
 	// Stop httpfetch thread (if started)
 	httpfetch_cleanup();
 
-	END_DEBUG_EXCEPTION_HANDLER(errorstream);
+	END_DEBUG_EXCEPTION_HANDLER
 
 	return retval;
 }
diff --git a/src/network/connection.cpp b/src/network/connection.cpp
index 0738c6a1f..f7452d8e4 100644
--- a/src/network/connection.cpp
+++ b/src/network/connection.cpp
@@ -1316,7 +1316,7 @@ void * ConnectionSendThread::run()
 		/* send non reliable packets */
 		sendPackets(dtime);
 
-		END_DEBUG_EXCEPTION_HANDLER(errorstream);
+		END_DEBUG_EXCEPTION_HANDLER
 	}
 
 	PROFILE(g_profiler->remove(ThreadIdentifier.str()));
@@ -2097,7 +2097,7 @@ void * ConnectionReceiveThread::run()
 			}
 		}
 #endif
-		END_DEBUG_EXCEPTION_HANDLER(errorstream);
+		END_DEBUG_EXCEPTION_HANDLER
 	}
 
 	PROFILE(g_profiler->remove(ThreadIdentifier.str()));
diff --git a/src/server.cpp b/src/server.cpp
index 8f105ffd2..d6207538f 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -112,7 +112,7 @@ void *ServerThread::run()
 		}
 	}
 
-	END_DEBUG_EXCEPTION_HANDLER(errorstream)
+	END_DEBUG_EXCEPTION_HANDLER
 
 	return NULL;
 }
diff --git a/src/util/thread.h b/src/util/thread.h
index a32871aab..8d8b6fe7f 100644
--- a/src/util/thread.h
+++ b/src/util/thread.h
@@ -223,7 +223,7 @@ public:
 			doUpdate();
 		}
 
-		END_DEBUG_EXCEPTION_HANDLER(errorstream)
+		END_DEBUG_EXCEPTION_HANDLER
 
 		return NULL;
 	}
-- 
cgit v1.2.3