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

Merge pull request #12058 from keszybz/oci-simplifications

Browse Source 
Follow-ups for nspawn-oci review
This commit is contained in:
Lennart Poettering
2019-03-21 13:55:09 +01:00
committed by GitHub
parent d0b6a10c00 6757a01356
commit c3d13d2ad5
5 changed files with 223 additions and 288 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/json.h
+3 -3
View File
@@ -264,12 +264,12 @@ static inline int json_dispatch_level(JsonDispatchFlags flags) {
int json_log_internal(JsonVariant *variant, int level, int error, const char *file, int line, const char *func, const char *format, ...) _printf_(7, 8);
#define json_log(variant, flags, error, ...) \
#define json_log(variant, flags, error, ...) \
({ \
int _level = json_dispatch_level(flags), _e = (error); \
int _level = json_dispatch_level(flags), _e = (error); \
(log_get_max_level() >= LOG_PRI(_level)) \
? json_log_internal(variant, _level, _e, __FILE__, __LINE__, __func__, __VA_ARGS__) \
: -abs(_e); \
: -ERRNO_VALUE(_e); \
})
#define JSON_VARIANT_STRING_CONST(x) _JSON_VARIANT_STRING_CONST(UNIQ, (x))