fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-01 07:58:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

default-route-manager: cleanup logging macros

Browse source 
(cherry picked from commit 3179b45412)
This commit is contained in:
Thomas Haller 2015-03-26 11:25:29 +01:00
parent 7916dc0f4a
commit 06e8841d9d
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/nm-default-route-manager.c
View file

@ -64,10 +64,11 @@ static NMDefaultRouteManager *singleton_instance;
#define _LOG(level, addr_family, ...) \
G_STMT_START { \
int __addr_family = (addr_family); \
guint64 __domain = __addr_family == AF_INET ? LOGD_IP4 : LOGD_IP6; \
const int __addr_family = (addr_family); \
const NMLogLevel __level = (level); \
const NMLogDomain __domain = __addr_family == AF_INET ? LOGD_IP4 : (__addr_family == AF_INET6 ? LOGD_IP6 : LOGD_IP); \
\
if (nm_logging_enabled ((level), (__domain))) { \
if (nm_logging_enabled (__level, __domain)) { \
char __ch = __addr_family == AF_INET ? '4' : (__addr_family == AF_INET6 ? '6' : '-'); \
char __prefix[30] = "default-route"; \
\
@ -75,7 +76,7 @@ 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), \
nm_log (__level, __domain, \
"%s: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \
__prefix _NM_UTILS_MACRO_REST(__VA_ARGS__)); \
} \