Fix #165: isenabled was misnamed and wrong

mcci-catena · Apr 21, 2019 · 43b2da6 · 43b2da6
1 parent 5a1392b
commit 43b2da6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/keywords.txt b/keywords.txt
@@ -190,7 +190,7 @@ isReplicated	KEYWORD2
 isStandard	KEYWORD2
 isValid	KEYWORD2
 isbound	KEYWORD2
-isenabled	KEYWORD2
+isEnabled	KEYWORD2
 islocated	KEYWORD2
 locate	KEYWORD2
 loop	KEYWORD2

diff --git a/src/Catena_Log.h b/src/Catena_Log.h
@@ -71,15 +71,22 @@ class cLog
 		this->m_uDebugFlags = uDebugFlags;
 		}
 
-	// check whether flags are enabled ... inline for speed
+	// old, incorrect polarity: return false if isEnabled() is true..
+	[[deprecated("use isEnabled(), check polarities; see issue #165")]]
 	bool isenabled(DebugFlags uDebugFlags) const
 		{
-		return ((uDebugFlags & this->m_uDebugFlags) == 0 &&
-		         uDebugFlags != kAlways && 
-			 uDebugFlags != kFatal);
+		return !this->isEnabled(uDebugFlags);
+		}
+
+	// check whether flags are enabled ... inline for speed
+	bool isEnabled(DebugFlags uDebugFlags) const
+		{
+		return ((uDebugFlags & this->m_uDebugFlags) != 0 ||
+		         uDebugFlags == kAlways ||
+			 uDebugFlags == kFatal);
 		}
 
-	// log	
+	// log, using debug flags. Note that args are evaluated even if no print.
 	void printf(
 		DebugFlags uDebugFlags,
 		const char *pFmt,

diff --git a/src/lib/Catena_Log.cpp b/src/lib/Catena_Log.cpp
@@ -53,7 +53,7 @@ cLog::printf(
 		return;
 
 	// either inbound mask must be zero or must match
-	if (this->isenabled(uDebugFlags))
+	if (! this->isEnabled(uDebugFlags))
 		return;
 
 	char buf[128];