shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-18 21:57:48 +03:00
Code

core/execute: do not use format str for log_object_internal

Browse Source 
This reverts part of 210ca71cb5d9f41df3b23eef28d6742bd90a0362.

Another fallout from that commit...

Fixes #32877
This commit is contained in:
Mike Yuan 2024-05-17 17:35:43 +08:00 committed by Luca Boccassi
parent e3828d7103
commit de12b8d163
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/core/execute.h
View File

@ -624,11 +624,6 @@ bool exec_needs_ipc_namespace(const ExecContext *context);
#define LOG_EXEC_INVOCATION_ID_FIELD_FORMAT(ep) \ #define LOG_EXEC_INVOCATION_ID_FIELD_FORMAT(ep) \
((ep)->runtime_scope == RUNTIME_SCOPE_USER ? "USER_INVOCATION_ID=%s" : "INVOCATION_ID=%s") ((ep)->runtime_scope == RUNTIME_SCOPE_USER ? "USER_INVOCATION_ID=%s" : "INVOCATION_ID=%s")
/* Like LOG_MESSAGE(), but with the unit name prefixed. */
#define LOG_EXEC_MESSAGE(ep, fmt, ...) LOG_MESSAGE("%s: " fmt, (ep)->unit_id, ##__VA_ARGS__)
#define LOG_EXEC_ID(ep) LOG_EXEC_ID_FIELD_FORMAT(ep), (ep)->unit_id
#define LOG_EXEC_INVOCATION_ID(ep) LOG_EXEC_INVOCATION_ID_FIELD_FORMAT(ep), (ep)->invocation_id_string
#define log_exec_full_errno_zerook(ec, ep, level, error, ...) \ #define log_exec_full_errno_zerook(ec, ep, level, error, ...) \
({ \ ({ \
const ExecContext *_c = (ec); \ const ExecContext *_c = (ec); \
@ -641,8 +636,10 @@ bool exec_needs_ipc_namespace(const ExecContext *context);
!_do_log ? -ERRNO_VALUE(error) : \ !_do_log ? -ERRNO_VALUE(error) : \
log_object_internal(_l, error, \ log_object_internal(_l, error, \
PROJECT_FILE, __LINE__, __func__, \ PROJECT_FILE, __LINE__, __func__, \
LOG_EXEC_ID(_p), \ LOG_EXEC_ID_FIELD(_p), \
LOG_EXEC_INVOCATION_ID(_p), \ _p->unit_id, \
LOG_EXEC_INVOCATION_ID_FIELD(_p), \
_p->invocation_id_string, \
##__VA_ARGS__); \ ##__VA_ARGS__); \
}) })
@ -667,6 +664,11 @@ bool exec_needs_ipc_namespace(const ExecContext *context);
#define log_exec_warning_errno(ec, ep, error, ...) log_exec_full_errno(ec, ep, LOG_WARNING, error, __VA_ARGS__) #define log_exec_warning_errno(ec, ep, error, ...) log_exec_full_errno(ec, ep, LOG_WARNING, error, __VA_ARGS__)
#define log_exec_error_errno(ec, ep, error, ...) log_exec_full_errno(ec, ep, LOG_ERR, error, __VA_ARGS__) #define log_exec_error_errno(ec, ep, error, ...) log_exec_full_errno(ec, ep, LOG_ERR, error, __VA_ARGS__)
/* Like LOG_MESSAGE(), but with the unit name prefixed. */
#define LOG_EXEC_MESSAGE(ep, fmt, ...) LOG_MESSAGE("%s: " fmt, (ep)->unit_id, ##__VA_ARGS__)
#define LOG_EXEC_ID(ep) LOG_EXEC_ID_FIELD_FORMAT(ep), (ep)->unit_id
#define LOG_EXEC_INVOCATION_ID(ep) LOG_EXEC_INVOCATION_ID_FIELD_FORMAT(ep), (ep)->invocation_id_string
#define log_exec_struct_errno(ec, ep, level, error, ...) \ #define log_exec_struct_errno(ec, ep, level, error, ...) \
({ \ ({ \
const ExecContext *_c = (ec); \ const ExecContext *_c = (ec); \