diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-04-22 11:12:29 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-04-22 11:22:19 +0200 |
| commit | 4526b55a516f2b7836a1879ca70d039b23dd7044 (patch) | |
| tree | 3aab6225afd4ca4b8289fa944b75b8f8a20b085a | |
| parent | fb9f8c69f7c665b9e1ed4358a5bc41548263b0fa (diff) | |
| download | NetworkManager-4526b55a516f2b7836a1879ca70d039b23dd7044.tar.gz | |
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().
| -rw-r--r-- | src/nm-auth-manager.c | 6 | ||||
| -rw-r--r-- | src/nm-default-route-manager.c | 6 | ||||
| -rw-r--r-- | src/nm-route-manager.c | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/nm-auth-manager.c b/src/nm-auth-manager.c index 3dd1511684..bcd1b96d4b 100644 --- a/src/nm-auth-manager.c +++ b/src/nm-auth-manager.c @@ -40,9 +40,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 c04dd96fa7..4caf4672d7 100644 --- a/src/nm-default-route-manager.c +++ b/src/nm-default-route-manager.c @@ -76,9 +76,9 @@ NM_DEFINE_SINGLETON_GETTER (NMDefaultRouteManager, nm_default_route_manager_get, 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 diff --git a/src/nm-route-manager.c b/src/nm-route-manager.c index 7c9d688392..daccb1639e 100644 --- a/src/nm-route-manager.c +++ b/src/nm-route-manager.c @@ -94,9 +94,9 @@ static const VTableIP vtable_v4, vtable_v6; g_snprintf (__prefix, sizeof (__prefix), "%s%c[%p]", _LOG_PREFIX_NAME, __ch, (self)); \ else \ __prefix[STRLEN (_LOG_PREFIX_NAME)] = __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 #define _LOG_LEVEL_ENABLED(level, addr_family) \ |