1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-22 06:50:18 +03:00

Merge pull request #8565 from poettering/cocci-again

run all coccinelle again
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-03-23 19:22:24 +01:00 committed by GitHub
commit 1238250f1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions

View File

@ -354,7 +354,8 @@ static int bus_service_set_transient_property(
if (streq(name, "SuccessExitStatus"))
return bus_set_transient_exit_status(u, name, &s->success_status, message, flags, error);
if ((ci = service_exec_command_from_string(name)) >= 0)
ci = service_exec_command_from_string(name);
if (ci >= 0)
return bus_set_transient_exec_command(u, name, &s->exec_command[ci], message, flags, error);
if (streq(name, "StandardInputFileDescriptor"))

View File

@ -1072,8 +1072,7 @@ int main(int argc, char *argv[]) {
end:
pager_close();
if (arg_output)
fclose(arg_output);
safe_fclose(arg_output);
return r >= 0 ? r : EXIT_FAILURE;
}

View File

@ -200,7 +200,7 @@ static bool check_compressed(uint64_t compress_threshold, uint64_t data_size) {
/* We have to partially reimplement some of the dump logic, because the normal next_entry does the
* decompression for us. */
p = le64toh(f->header->header_size);
while (true) {
for (;;) {
r = journal_file_move_to_object(f, OBJECT_UNUSED, p, &o);
assert_se(r == 0);
if (o->object.type == OBJECT_DATA)