Browse code

cleanup: remove code duplication in msg_test()

Use check_debug_level() instead of writing out the exact same check in
msg_test().

Signed-off-by: Steffan Karger <steffan@karger.me>
Acked-by: David Sommerseth <davids@openvpn.net>
Message-Id: 1472757207-17900-1-git-send-email-steffan@karger.me
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg00192.html
Signed-off-by: David Sommerseth <davids@openvpn.net>
(cherry picked from commit d7ce876841d1d5b01940251f92780fdbb05b4df0)

Steffan Karger authored on 2016/09/02 04:13:27
Showing 1 changed files
... ...
@@ -138,12 +138,6 @@ extern int x_msg_line_num;
138 138
 /** Check muting filter */
139 139
 bool dont_mute (unsigned int flags);
140 140
 
141
-/** Return true if flags represent an enabled, not muted log level */
142
-static inline bool msg_test (unsigned int flags)
143
-{
144
-  return ((flags & M_DEBUG_LEVEL) <= x_debug_level) && dont_mute (flags);
145
-}
146
-
147 141
 /* Macro to ensure (and teach static analysis tools) we exit on fatal errors */
148 142
 #define EXIT_FATAL(flags) do { if ((flags) & M_FATAL) _exit(1); } while (false)
149 143
 
... ...
@@ -235,6 +229,12 @@ check_debug_level (unsigned int level)
235 235
   return (level & M_DEBUG_LEVEL) <= x_debug_level;
236 236
 }
237 237
 
238
+/** Return true if flags represent an enabled, not muted log level */
239
+static inline bool msg_test (unsigned int flags)
240
+{
241
+  return check_debug_level (flags) && dont_mute (flags);
242
+}
243
+
238 244
 /* Call if we forked */
239 245
 void msg_forked (void);
240 246