tree-wide: mark log_struct with _printf_ and fix fallout
log_struct takes multiple format strings, each one followed by arguments. The _printf_ annotation is not sufficiently flexible to express this, but we can still annotate the first format string, though not its arguments (because their number is unknown). With the annotation, the places which specified the message id or similar as the first pattern cause a warning from -Wformat-nonliteral. This can be trivially fixed by putting the MESSAGE= first. This change will help find issues where a non-literal is erroneously used as the pattern.
This commit is contained in:
+2
-2
@@ -2887,9 +2887,9 @@ static int exec_child(
|
||||
if (line) {
|
||||
log_open();
|
||||
log_struct(LOG_DEBUG,
|
||||
LOG_UNIT_ID(unit),
|
||||
"EXECUTABLE=%s", command->path,
|
||||
LOG_UNIT_MESSAGE(unit, "Executing: %s", line),
|
||||
LOG_UNIT_ID(unit),
|
||||
NULL);
|
||||
log_close();
|
||||
}
|
||||
@@ -2953,9 +2953,9 @@ int exec_spawn(Unit *unit,
|
||||
return log_oom();
|
||||
|
||||
log_struct(LOG_DEBUG,
|
||||
LOG_UNIT_ID(unit),
|
||||
LOG_UNIT_MESSAGE(unit, "About to execute: %s", line),
|
||||
"EXECUTABLE=%s", command->path,
|
||||
LOG_UNIT_ID(unit),
|
||||
NULL);
|
||||
pid = fork();
|
||||
if (pid < 0)
|
||||
|
||||
Reference in New Issue
Block a user