diff options
author | Thomas Haller <thaller@redhat.com> | 2021-03-18 16:49:40 +0100 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2021-03-18 16:54:00 +0100 |
commit | db773fd54e36d2e0e3d12586a7d8d73a6d124835 (patch) | |
tree | 3f26219386838e9de36da92ed3b5935f563377b0 | |
parent | 008302aa4ed68a2f248c2077ccdbd533bd4c2c76 (diff) | |
download | NetworkManager-db773fd54e36d2e0e3d12586a7d8d73a6d124835.tar.gz |
dispatcher: set G_LOG_DOMAIN to "nm-dispatcher"
Originally, we would define G_LOG_DOMAIN via CFLAGS arguments.
Since commit 341b6e0704da ('all: change G_LOG_DOMAIN to "nm"') we would
instead set it in source and uniformly define it as "nm".
The reasons are that most parts of our source should not use g_log() directly,
and there is an aim to avoid special CFLAGS to simplify the build setup.
However, dispatcher indeed uses g_log() for logging, so the value there
is important.
Fix that, but this time by setting the define in source not via
CFLAGS.
Fixes: 341b6e0704da ('all: change G_LOG_DOMAIN to "nm"')
-rw-r--r-- | src/libnm-std-aux/nm-default-std.h | 4 | ||||
-rw-r--r-- | src/nm-dispatcher/nm-dispatcher.c | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/libnm-std-aux/nm-default-std.h b/src/libnm-std-aux/nm-default-std.h index 0bd0eaa0c2..5f4af3a548 100644 --- a/src/libnm-std-aux/nm-default-std.h +++ b/src/libnm-std-aux/nm-default-std.h @@ -12,7 +12,9 @@ #error Dont define NETWORKMANAGER_COMPILATION #endif -#define G_LOG_DOMAIN "nm" +#ifndef G_LOG_DOMAIN + #define G_LOG_DOMAIN "nm" +#endif /*****************************************************************************/ diff --git a/src/nm-dispatcher/nm-dispatcher.c b/src/nm-dispatcher/nm-dispatcher.c index 3447f65ef3..eb1781faf6 100644 --- a/src/nm-dispatcher/nm-dispatcher.c +++ b/src/nm-dispatcher/nm-dispatcher.c @@ -3,6 +3,8 @@ * Copyright (C) 2008 - 2012 Red Hat, Inc. */ +#define G_LOG_DOMAIN "nm-dispatcher" + #include "libnm-client-aux-extern/nm-default-client.h" #include <syslog.h> |