diff options
| author | Thomas Haller <thaller@redhat.com> | 2023-03-28 11:09:23 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2023-04-03 10:27:43 +0200 |
| commit | f74109e4b03f365ab72d7ff0035e264f38320e98 (patch) | |
| tree | a5a379480ea170f65cc06b55b7b6842471ff8487 | |
| parent | b5875ec79ee245a0576c8f3db252273b5aa1dd33 (diff) | |
| download | NetworkManager-f74109e4b03f365ab72d7ff0035e264f38320e98.tar.gz | |
core: rename nmlog defines in "nm-core-utils.c"
Those are related to _NMLOG2() macro. Rename.
| -rw-r--r-- | src/core/nm-core-utils.c | 46 |
1 files changed, 26 insertions, 20 deletions
diff --git a/src/core/nm-core-utils.c b/src/core/nm-core-utils.c index 4ee0d12322..19027ef96f 100644 --- a/src/core/nm-core-utils.c +++ b/src/core/nm-core-utils.c @@ -4877,25 +4877,25 @@ typedef struct { gsize out_buffer_offset; } HelperInfo; -#define _NMLOG_PREFIX_NAME "helper" -#define _NMLOG_DOMAIN LOGD_CORE -#define _NMLOG2(level, info, ...) \ - G_STMT_START \ - { \ - if (nm_logging_enabled((level), (_NMLOG_DOMAIN))) { \ - HelperInfo *_info = (info); \ - \ - _nm_log((level), \ - (_NMLOG_DOMAIN), \ - 0, \ - NULL, \ - NULL, \ - _NMLOG_PREFIX_NAME "[" NM_HASH_OBFUSCATE_PTR_FMT \ - ",%d]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ - NM_HASH_OBFUSCATE_PTR(_info), \ - _info->pid _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ - } \ - } \ +#define _NMLOG2_PREFIX_NAME "helper" +#define _NMLOG2_DOMAIN LOGD_CORE +#define _NMLOG2(level, info, ...) \ + G_STMT_START \ + { \ + if (nm_logging_enabled((level), (_NMLOG2_DOMAIN))) { \ + HelperInfo *_info = (info); \ + \ + _nm_log((level), \ + (_NMLOG2_DOMAIN), \ + 0, \ + NULL, \ + NULL, \ + _NMLOG2_PREFIX_NAME "[" NM_HASH_OBFUSCATE_PTR_FMT \ + ",%d]: " _NM_UTILS_MACRO_FIRST(__VA_ARGS__), \ + NM_HASH_OBFUSCATE_PTR(_info), \ + _info->pid _NM_UTILS_MACRO_REST(__VA_ARGS__)); \ + } \ + } \ G_STMT_END static void @@ -4919,7 +4919,13 @@ helper_info_free(gpointer data) if (info->pid != -1) { nm_assert(info->pid > 1); - nm_utils_kill_child_async(info->pid, SIGKILL, LOGD_CORE, _NMLOG_PREFIX_NAME, 0, NULL, NULL); + nm_utils_kill_child_async(info->pid, + SIGKILL, + LOGD_CORE, + _NMLOG2_PREFIX_NAME, + 0, + NULL, + NULL); } g_free(info); |