cleanup: remove code duplication in msg_test()

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

---
 src/openvpn/error.h | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

index 76515d6..ced2fdf 100644
@@ -138,12 +138,6 @@ extern int x_msg_line_num;
 /** Check muting filter */
 bool dont_mute (unsigned int flags);
 
-/** Return true if flags represent an enabled, not muted log level */
-static inline bool msg_test (unsigned int flags)
-{
-  return ((flags & M_DEBUG_LEVEL) <= x_debug_level) && dont_mute (flags);
-}
-
 /* Macro to ensure (and teach static analysis tools) we exit on fatal errors */
 #define EXIT_FATAL(flags) do { if ((flags) & M_FATAL) _exit(1); } while (false)
 

@@ -237,6 +231,12 @@ check_debug_level (unsigned int level)
   return (level & M_DEBUG_LEVEL) <= x_debug_level;
 }
 
+/** Return true if flags represent an enabled, not muted log level */
+static inline bool msg_test (unsigned int flags)
+{
+  return check_debug_level (flags) && dont_mute (flags);
+}
+
 /* Call if we forked */
 void msg_forked (void);
 

2.7.4

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Your patch has been applied to the following branches

commit d7ce876841d1d5b01940251f92780fdbb05b4df0 (master) commit 59114b956a46c89da06b36a37b4db0a7a087b879 (release/2.3)

Author: Steffan Karger
Date:   Thu Sep 1 21:13:27 2016 +0200

     cleanup: remove code duplication in msg_test()

     Signed-off-by: Steffan Karger <[email protected]...>
     Acked-by: David Sommerseth <[email protected]...>
     Message-Id: [email protected]...
     URL: https://www.mail-archive.com/[email protected]/msg00192.html
     Signed-off-by: David Sommerseth <[email protected]...>

- --
kind regards,

David Sommerseth

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)

iQIcBAEBAgAGBQJX3CMHAAoJEIbPlEyWcf3yOKUP/R0ChyXdU3ivwNadtmo7zBTh KCNd+X2YQ9qKvhiyAtSj8Ut1F3xKHVGN2E8xeG3aWEe1vyOqt2RH6mncuRUjrzGF D/OaOzB3ztYq20zlRE8MRb3lIwZgfCjWCVZZy8MuE7T2UBuT0Hf3ihtje9iz2ufE rSuS2ob+vWvZYK7Ij6601AcrLNL5T3dUqieXBCWuDqfLwmcS4ZPuTAMtI9dlf1vH Wcko4MeeBbb1DCZSDPqeNMRWUGLJjUNby8Kt/VkujHvNoyxzokdoJLDOojjDKY+Z KhjtTC5tF0ItUcO1QbAGMbp8mjQvaJ854378XwbawR9lBppDYBGsJgteyRRwkFvz d0VdacJrKgzBHjoOpWYydqws7KTWvhl+W4/As4Bn8uJVDzk19sWY/cZWl8J/dCWy fn5L8KVmjCgEDwvCMnA6krjiwv5RN0qGtE+dhmQEGiy6l7ulvY231mrao8aOnIQi rx2cJyeUMSph8NswOCeN2u78dr85g7qwJ0HFSwHDBlWwyUWq6Bwj7LETR6rO5zOn aDPTJZW3HCmIgTgA2Z0okrZsQ6TyZ9w9+fr3O8mtVBCyq4Ja0B2ofDuvVCfu2Re5 EG2cSOqj/fvBSdRH4Fs16V98Dw0401oNyPPFGiFk9jvScY2Twua08vsB1nD7byZ1 IFycA0LBWXT4owmG5d4z
=xsz5
-----END PGP SIGNATURE-----