From d2f646828e90513355ab61855556242b32a14e48 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Mar 2018 16:32:26 +0100 Subject: [PATCH 1/3] coccinelle: run while-true.cocci again --- src/journal/test-journal.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/test-journal.c b/src/journal/test-journal.c index 3b9917b4a8c..f90b7e43755 100644 --- a/src/journal/test-journal.c +++ b/src/journal/test-journal.c @@ -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) From f5c4b520bae5a38f333f3cb9ef71ab23d4f9da93 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Mar 2018 16:32:48 +0100 Subject: [PATCH 2/3] coccinelle: run safe_fclose.cocci again --- src/coredump/coredumpctl.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c index a1b8b85e105..b0a00cda378 100644 --- a/src/coredump/coredumpctl.c +++ b/src/coredump/coredumpctl.c @@ -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; } From be6bca47ecdc5dbf4bd4b8fb3ff97c110303a516 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 23 Mar 2018 16:33:38 +0100 Subject: [PATCH 3/3] coccinelle: run no-if-assignments.cocci again --- src/core/dbus-service.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/dbus-service.c b/src/core/dbus-service.c index 6de905b69c1..587d9b5f9e1 100644 --- a/src/core/dbus-service.c +++ b/src/core/dbus-service.c @@ -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"))