Extracting check wether or not a debug message should be printed into shared function to avoid code duplication

Author: aentinger

src/Arduino_DebugUtils.cpp

@@ -60,36 +60,32 @@ void Arduino_DebugUtils::timestampOff() {
 
 void Arduino_DebugUtils::print(int const debug_level, const char * fmt, ...)
 {
-  if (debug_level >= DBG_ERROR   &&
-      debug_level <= DBG_VERBOSE &&
-      debug_level <= _debug_level)
-  {
-    if (_timestamp_on)
-      printTimestamp();
-
-    va_list args;
-    va_start(args, fmt);
-    vPrint(fmt, args);
-    va_end(args);
-  }
+  if (!shouldPrint(debug_level))
+    return;
+
+  if (_timestamp_on)
+    printTimestamp();
+
+  va_list args;
+  va_start(args, fmt);
+  vPrint(fmt, args);
+  va_end(args);
 }
 
 void Arduino_DebugUtils::print(int const debug_level, const __FlashStringHelper * fmt, ...)
 {
-  if (debug_level >= DBG_ERROR   &&
-      debug_level <= DBG_VERBOSE &&
-      debug_level <= _debug_level)
-  {
-    if (_timestamp_on)
-      printTimestamp();
-
-    String fmt_str(fmt);
-
-    va_list args;
-    va_start(args, fmt_str.c_str());
-    vPrint(fmt_str.c_str(), args);
-    va_end(args);
-  }
+  if (!shouldPrint(debug_level))
+    return;
+
+  if (_timestamp_on)
+    printTimestamp();
+
+  String fmt_str(fmt);
+
+  va_list args;
+  va_start(args, fmt_str.c_str());
+  vPrint(fmt_str.c_str(), args);
+  va_end(args);
 }
 
 /******************************************************************************
@@ -112,6 +108,11 @@ void Arduino_DebugUtils::printTimestamp()
   _debug_output_stream->print(timestamp);
 }
 
+bool Arduino_DebugUtils::shouldPrint(int const debug_level) const
+{
+  return ((debug_level >= DBG_ERROR) && (debug_level <= DBG_VERBOSE) && (debug_level <= _debug_level));
+}
+
 /******************************************************************************
    CLASS INSTANTIATION
  ******************************************************************************/

src/Arduino_DebugUtils.h

@@ -68,6 +68,7 @@ class Arduino_DebugUtils {
 
     void vPrint(char const * fmt, va_list args);
     void printTimestamp();
+    bool shouldPrint(int const debug_level) const;
 
 };