core: strjoina() in a loop is never OK
Let's use plain strjoin() instead.
This commit is contained in:
parent
a2a444440f
commit
c475e57d67
|
@ -3118,6 +3118,8 @@ int manager_serialize(
|
||||||
fprintf(f, "log-target-override=%s\n", log_target_to_string(log_get_target()));
|
fprintf(f, "log-target-override=%s\n", log_target_to_string(log_get_target()));
|
||||||
|
|
||||||
for (q = 0; q < _MANAGER_TIMESTAMP_MAX; q++) {
|
for (q = 0; q < _MANAGER_TIMESTAMP_MAX; q++) {
|
||||||
|
_cleanup_free_ char *joined = NULL;
|
||||||
|
|
||||||
/* The following timestamps only apply to the host system, hence only serialize them there */
|
/* The following timestamps only apply to the host system, hence only serialize them there */
|
||||||
if (in_initrd() &&
|
if (in_initrd() &&
|
||||||
IN_SET(q, MANAGER_TIMESTAMP_USERSPACE, MANAGER_TIMESTAMP_FINISH,
|
IN_SET(q, MANAGER_TIMESTAMP_USERSPACE, MANAGER_TIMESTAMP_FINISH,
|
||||||
|
@ -3126,9 +3128,11 @@ int manager_serialize(
|
||||||
MANAGER_TIMESTAMP_UNITS_LOAD_START, MANAGER_TIMESTAMP_UNITS_LOAD_FINISH))
|
MANAGER_TIMESTAMP_UNITS_LOAD_START, MANAGER_TIMESTAMP_UNITS_LOAD_FINISH))
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
t = manager_timestamp_to_string(q);
|
joined = strjoin(manager_timestamp_to_string(q), "-timestamp");
|
||||||
const char *field = strjoina(t, "-timestamp");
|
if (!joined)
|
||||||
dual_timestamp_serialize(f, field, m->timestamps + q);
|
return log_oom();
|
||||||
|
|
||||||
|
dual_timestamp_serialize(f, joined, m->timestamps + q);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!switching_root)
|
if (!switching_root)
|
||||||
|
|
Loading…
Reference in a new issue