SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-device: drop subsystem from log_device_*()

Browse Source 
The sd_device object always has syspath and sysname, but subsytem may not.
Also, it may take some costs to get subsystem.
So, let's drop subsystem from logs.
This commit is contained in:
Yu Watanabe
2018-11-06 15:45:22 +09:00
parent 8912a99cea
commit 38d1555d7c
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-device/device-util.h
+3 -5
View File
@@ -33,17 +33,15 @@
#define log_device_full(device, level, error, ...) \
({ \
const char *_sysname = NULL, *_subsystem = NULL; \
const char *_sysname = NULL; \
sd_device *_d = (device); \
int _level = (level), _error = (error); \
\
if (_d && _unlikely_(log_get_max_level() >= _level)) { \
if (_d && _unlikely_(log_get_max_level() >= _level)) \
(void) sd_device_get_sysname(_d, &_sysname); \
(void) sd_device_get_subsystem(_d, &_subsystem); \
} \
log_object_internal(_level, _error, __FILE__, __LINE__, __func__, \
_sysname ? "DEVICE=" : NULL, _sysname, \
_subsystem ? "SUBSYSTEM=" : NULL, _subsystem, ##__VA_ARGS__); \
NULL, NULL, ##__VA_ARGS__); \
})
#define log_device_debug(device, ...) log_device_full(device, LOG_DEBUG, 0, ##__VA_ARGS__)