diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-05-03 14:12:26 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-05-03 14:58:17 +0200 |
| commit | 4627645442345dd5e433fec33913f034d48c8091 (patch) | |
| tree | f33a454e44ca5ee70b4bdfbbaef6f9b763e64792 /src/core | |
| parent | a76dc1f3a042adf203a79c34846563f5528b17bb (diff) | |
| download | systemd-4627645442345dd5e433fec33913f034d48c8091.tar.gz | |
manager: simplify manager_process_barrier_fd() a bit
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/manager.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 9226cd2ab7..2a7e80ca67 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -2525,11 +2525,10 @@ static bool manager_process_barrier_fd(char * const *tags, FDSet *fds) { /* nothing else must be sent when using BARRIER=1 */ if (strv_contains(tags, "BARRIER=1")) { - if (strv_length(tags) == 1) { - if (fdset_size(fds) != 1) - log_warning("Got incorrect number of fds with BARRIER=1, closing them."); - } else + if (strv_length(tags) != 1) log_warning("Extra notification messages sent with BARRIER=1, ignoring everything."); + else if (fdset_size(fds) != 1) + log_warning("Got incorrect number of fds with BARRIER=1, closing them."); /* Drop the message if BARRIER=1 was found */ return true; |