From 581b6fe5234110efa9c27751ed2c9e062ae8f248 Mon Sep 17 00:00:00 2001
From: Oz Linden <oz@lindenlab.com>
Date: Tue, 24 Sep 2019 15:08:45 -0400
Subject: [PATCH] simplify function pointer logging
---
indra/llcommon/llerror.cpp | 10 ++++++----
indra/llcommon/llleap.cpp | 2 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index df8443bd7a2..1f947a0a74a 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -722,14 +722,16 @@ namespace LLError
void setFatalHook(const FatalHook& fatal_hook)
{
SettingsConfigPtr s = Settings::getInstance()->getSettingsConfig();
+ LL_DEBUGS("FatalHook") << "set fatal hook to "(fatal_hook ? "non-null" : "null")
+ << " was " << (s->mFatalHook ? "non-null" : "null")
+ << LL_ENDL;
s->mFatalHook = fatal_hook;
- LL_DEBUGS("FatalHook") << "set fatal hook to " << reinterpret_cast<void*>(fatal_hook) << LL_ENDL;
- }
-
+ }
+
FatalHook getFatalHook()
{
SettingsConfigPtr s = Settings::getInstance()->getSettingsConfig();
- LL_DEBUGS("FatalHook") << "read fatal hook " << reinterpret_cast<void*>(s->mFatalHook) << LL_ENDL;
+ LL_DEBUGS("FatalHook") << "read fatal hook was " << (s->mFatalHook ? "non-null" : "null") << LL_ENDL;
return s->mFatalHook;
}
diff --git a/indra/llcommon/llleap.cpp b/indra/llcommon/llleap.cpp
index bb32c73d041..1c0678e4538 100644
--- a/indra/llcommon/llleap.cpp
+++ b/indra/llcommon/llleap.cpp
@@ -67,7 +67,7 @@ class LLLeapImpl: public LLLeap
// this class or method name.
mListener(new LLLeapListener(boost::bind(&LLLeapImpl::connect, this, _1, _2)))
{
- LL_DEBUGS("FatalHook") << "previous fatal hook was " <<reinterpret_cast<void*>(mPrevFatalHook) << LL_ENDL;
+ LL_DEBUGS("FatalHook") << "previous fatal hook was " << (mPrevFatalHook ? "non-null" : "null") << LL_ENDL;
// Rule out unpopulated Params block
if (! cparams.executable.isProvided())
{
--
GitLab