From 65b074164e4f4244e39560015beaaf01defe0185 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 22 Apr 2015 11:12:29 +0200 Subject: [PATCH] logging: use _nm_log() to avoid duplicate check of whether logging is enabled Use _nm_log() in places that already checked whether logging is enabled. No need to check again as done by nm_log(). (cherry picked from commit 4526b55a516f2b7836a1879ca70d039b23dd7044) Conflicts: src/nm-route-manager.c --- src/nm-auth-manager.c | 6 +++--- src/nm-default-route-manager.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 2b929f6756..8bd167eff9 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -39,9 +39,9 @@ \ if ((self) != singleton_instance) \ g_snprintf (__prefix, sizeof (__prefix), "auth[%p]", (self)); \ - nm_log ((level), (domain), \ - "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ - __prefix _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ + _nm_log ((level), (domain), 0, \ + "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ + __prefix _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ } \ } G_STMT_END diff --git a/src/nm-default-route-manager.c b/src/nm-default-route-manager.c index 2fd396c4f0..153c1de6bb 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -76,9 +76,9 @@ static NMDefaultRouteManager *singleton_instance; g_snprintf (__prefix, sizeof (__prefix), "default-route%c[%p]", __ch, (self)); \ else \ __prefix[STRLEN ("default-route")] = __ch; \ - nm_log (__level, __domain, \ - "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ - __prefix _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ + _nm_log (__level, __domain, 0, \ + "%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ + __prefix _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ } \ } G_STMT_END