tree-wide: drop {} from one-line if blocks

Patch via coccinelle.

diff --git a/coccinelle/empty-if.cocci b/coccinelle/empty-if.cocci
new file mode 100644 (file)
index 0000000..ebd0bfd
--- /dev/null
+++ b/coccinelle/empty-if.cocci
@@ -0,0 +1,19 @@
+@@
+expression e, f;
+statement s, t;
+@@
+(
+if (e) {
+if (f) s
+}
+|
+if (e) {
+if (f) s
+else t
+}
+|
+- if (e) {
++ if (e)
+s
+- }
+)

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index e38a4340b66606e7244b9aad5a6d17b5bbdbadbe..bce8026f40474dba7bdf9ab7b20ed4f8c9356fa5 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -844,11 +844,8 @@ static int list_dependencies_one(sd_bus *bus, const char *name, unsigned int lev
 
         STRV_FOREACH(c, deps) {
                 times = hashmap_get(unit_times_hashmap, *c);
-                if (times && times->activated
-                    && times->activated <= boot->finish_time
-                    && (service_longest - times->activated) <= arg_fuzz) {
+                if (times && times->activated && times->activated <= boot->finish_time && (service_longest - times->activated) <= arg_fuzz)
                         to_print++;
-                }
         }
 
         if (!to_print)

diff --git a/src/basic/strv.c b/src/basic/strv.c
index aa68d290f615ca5cc381d3d30949f5b3e25965be..b9aef64b1586b78974800787d3ffbef2a2eb18ce 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -270,9 +270,8 @@ char **strv_split_newlines(const char *s) {
         if (n <= 0)
                 return l;
 
-        if (isempty(l[n-1])) {
+        if (isempty(l[n - 1]))
                 l[n - 1] = mfree(l[n - 1]);
-        }
 
         return l;
 }
@@ -291,9 +290,8 @@ int strv_split_extract(char ***t, const char *s, const char *separators, Extract
                 r = extract_first_word(&s, &word, separators, flags);
                 if (r < 0)
                         return r;
-                if (r == 0) {
+                if (r == 0)
                         break;
-                }
 
                 if (!GREEDY_REALLOC(l, allocated, n + 2))
                         return -ENOMEM;

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 322cec84a9efabc04bd9bdc7911424e61e295013..e61b58b5e5f0494905942c51e946936dc7221400 100644 (file)
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -438,10 +438,9 @@ int main(int argc, char *argv[]) {
 
                         res = nanosleep(&req, NULL);
                         if (res) {
-                                if (errno == EINTR) {
+                                if (errno == EINTR)
                                         /* caught signal, probably HUP! */
                                         break;
-                                }
                                 log_error_errno(errno, "nanosleep() failed: %m");
                                 return EXIT_FAILURE;
                         }

diff --git a/src/bootchart/svg.c b/src/bootchart/svg.c
index a7ef653d5d0d78d2c9d2920e3419eb14c367db82..1231e6eaceb075847de150b959310133b8b135b6 100644 (file)
--- a/src/bootchart/svg.c
+++ b/src/bootchart/svg.c
@@ -630,12 +630,11 @@ static void svg_io_bi_bar(FILE *of,
                                 pbi * (arg_scale_y * 5));
 
                 /* labels around highest value */
-                if (i == max_here) {
+                if (i == max_here)
                         fprintf(of, "  <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
                                 time_to_graph(sampledata->sampletime - graph_start) + 5,
                                 ((arg_scale_y * 5) - (pbi * (arg_scale_y * 5))) + 15,
                                 max / 1024.0 / (interval / 1000000000.0));
-                }
 
                 i++;
                 prev_sampledata = sampledata;
@@ -743,12 +742,11 @@ static void svg_io_bo_bar(FILE *of,
                                 pbo * (arg_scale_y * 5));
 
                 /* labels around highest bo value */
-                if (i == max_here) {
+                if (i == max_here)
                         fprintf(of, "  <text class=\"sec\" x=\"%.03f\" y=\"%.03f\">%0.2fmb/sec</text>\n",
                                 time_to_graph(sampledata->sampletime - graph_start) + 5,
                                 ((arg_scale_y * 5) - (pbo * (arg_scale_y * 5))),
                                 max / 1024.0 / (interval / 1000000000.0));
-                }
 
                 i++;
                 prev_sampledata = sampledata;

diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
index 0299fe76036b3edac4df2dcc3d4533e1c359bc44..b695c57da8e441acaf315e61e469e99d4a7e52dd 100644 (file)
--- a/src/core/load-fragment.c
+++ b/src/core/load-fragment.c
@@ -3568,12 +3568,11 @@ int unit_load_fragment(Unit *u) {
                 if (r < 0)
                         return r;
 
-                if (u->load_state == UNIT_STUB) {
+                if (u->load_state == UNIT_STUB)
                         /* Hmm, this didn't work? Then let's get rid
                          * of the fragment path stored for us, so that
                          * we don't point to an invalid location. */
                         u->fragment_path = mfree(u->fragment_path);
-                }
         }
 
         /* Look for a template */

diff --git a/src/core/main.c b/src/core/main.c
index 091af6a9df326c6a1dc1a9edbb0a2ad5524ee4a7..9aaf244e715a43bccf9217f9f737276356854c5f 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -1204,12 +1204,11 @@ static int status_welcome(void) {
                            "PRETTY_NAME", &pretty_name,
                            "ANSI_COLOR", &ansi_color,
                            NULL);
-        if (r == -ENOENT) {
+        if (r == -ENOENT)
                 r = parse_env_file("/usr/lib/os-release", NEWLINE,
                                    "PRETTY_NAME", &pretty_name,
                                    "ANSI_COLOR", &ansi_color,
                                    NULL);
-        }
 
         if (r < 0 && r != -ENOENT)
                 log_warning_errno(r, "Failed to read os-release file: %m");

diff --git a/src/core/manager.c b/src/core/manager.c
index cd0513fd69a3c2429be989b1cbd59d3d7d9022a1..d918007bb87e1fbeccbab9060393e17e7796460c 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -2792,9 +2792,8 @@ static void trim_generator_dir(Manager *m, char **generator) {
         if (!*generator)
                 return;
 
-        if (rmdir(*generator) >= 0) {
+        if (rmdir(*generator) >= 0)
                 *generator = mfree(*generator);
-        }
 
         return;
 }

diff --git a/src/core/service.c b/src/core/service.c
index 1cf1fcffdcd61c576172420abbc5d25854e48818..e396dbe213c2641f300162e05dcf87a673439054 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -695,13 +695,12 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
                 fprintf(f, "%sStatus Text: %s\n",
                         prefix, s->status_text);
 
-        if (s->n_fd_store_max > 0) {
+        if (s->n_fd_store_max > 0)
                 fprintf(f,
                         "%sFile Descriptor Store Max: %u\n"
                         "%sFile Descriptor Store Current: %u\n",
                         prefix, s->n_fd_store_max,
                         prefix, s->n_fd_store);
-        }
 }
 
 static int service_load_pid_file(Service *s, bool may_warn) {

diff --git a/src/core/transaction.c b/src/core/transaction.c
index b505297e238318fb6e07847c649a3304c1c4c87e..b8f69ec6f3a5c1639344e976c80c088d3eeba3ea 100644 (file)
--- a/src/core/transaction.c
+++ b/src/core/transaction.c
@@ -380,12 +380,10 @@ static int transaction_verify_order_one(Transaction *tr, Job *j, Job *from, unsi
                                          "Found dependency on %s/%s",
                                          k->unit->id, job_type_to_string(k->type));
 
-                        if (!delete && hashmap_get(tr->jobs, k->unit) &&
-                            !unit_matters_to_anchor(k->unit, k)) {
+                        if (!delete && hashmap_get(tr->jobs, k->unit) && !unit_matters_to_anchor(k->unit, k))
                                 /* Ok, we can drop this one, so let's
                                  * do so. */
                                 delete = k;
-                        }
 
                         /* Check if this in fact was the beginning of
                          * the cycle */

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 74fa90a233632030df7c991357e57bc9c61c0bfe..5d5872b7f4b3b58b8fcdefd1c10f581ebfa1e9e8 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -329,12 +329,11 @@ static int get_password(const char *vol, const char *src, usec_t until, bool acc
         description = disk_description(src);
         mount_point = disk_mount_point(vol);
 
-        if (description && streq(vol, description)) {
+        if (description && streq(vol, description))
                 /* If the description string is simply the
                  * volume name, then let's not show this
                  * twice */
                 description = mfree(description);
-        }
 
         if (mount_point && description)
                 r = asprintf(&name_buffer, "%s (%s) on %s", description, vol, mount_point);

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index e1ce2e6b31c1e98fc5f40dbbe6243c535a6f8929..cb837e9d030053f1c93a5f829955d696fcddd55a 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -113,12 +113,11 @@ static int context_read_data(Context *c) {
                            "PRETTY_NAME", &c->data[PROP_OS_PRETTY_NAME],
                            "CPE_NAME", &c->data[PROP_OS_CPE_NAME],
                            NULL);
-        if (r == -ENOENT) {
+        if (r == -ENOENT)
                 r = parse_env_file("/usr/lib/os-release", NEWLINE,
                                    "PRETTY_NAME", &c->data[PROP_OS_PRETTY_NAME],
                                    "CPE_NAME", &c->data[PROP_OS_CPE_NAME],
                                    NULL);
-        }
 
         if (r < 0 && r != -ENOENT)
                 return r;

diff --git a/src/import/importd.c b/src/import/importd.c
index ffff94ee721beafee1ed3b7c3121a7d0182d2e8c..b91300a5df2431ca0af3d1b86a27535eb15703ce 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -600,12 +600,9 @@ static int manager_on_notify(sd_event_source *s, int fd, uint32_t revents, void
         cmsg_close_all(&msghdr);
 
         CMSG_FOREACH(cmsg, &msghdr) {
-                if (cmsg->cmsg_level == SOL_SOCKET &&
-                           cmsg->cmsg_type == SCM_CREDENTIALS &&
-                           cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred))) {
+                if (cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_type == SCM_CREDENTIALS && cmsg->cmsg_len == CMSG_LEN(sizeof(struct ucred)))
 
                         ucred = (struct ucred*) CMSG_DATA(cmsg);
-                }
         }
 
         if (msghdr.msg_flags & MSG_TRUNC) {

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 52078b1b374218b40e34addd6d8a9e4c4b4fdaea..bb762c88321a937e511d065b46bc144319bbe4a5 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -337,9 +337,8 @@ static int request_parse_range(
                 return -ENOMEM;
 
         m->cursor[strcspn(m->cursor, WHITESPACE)] = 0;
-        if (isempty(m->cursor)) {
+        if (isempty(m->cursor))
                 m->cursor = mfree(m->cursor);
-        }
 
         return 0;
 }

diff --git a/src/journal-remote/journal-upload-journal.c b/src/journal-remote/journal-upload-journal.c
index 3d2e52cacf2a51b0b73c0c36407507baec42401e..507210f51c4c57c071fca7c34eff46f747226d36 100644 (file)
--- a/src/journal-remote/journal-upload-journal.c
+++ b/src/journal-remote/journal-upload-journal.c
@@ -374,10 +374,9 @@ int open_journal_for_upload(Uploader *u,
 
         if (cursor) {
                 r = sd_journal_seek_cursor(j, cursor);
-                if (r < 0) {
+                if (r < 0)
                         return log_error_errno(r, "Failed to seek to cursor %s: %m",
                                                cursor);
-                }
         }
 
         return process_journal_input(u, 1 + !!after_cursor);

diff --git a/src/journal/journald-audit.c b/src/journal/journald-audit.c
index 83c3332abf20b0de114190bb1c798d85f37a79fb..fe8ae194c9d145cc81a24b6ccd9b87b0f1fe3531 100644 (file)
--- a/src/journal/journald-audit.c
+++ b/src/journal/journald-audit.c
@@ -324,10 +324,9 @@ static int map_all_fields(
                         if (r < 0)
                                 return log_debug_errno(r, "Failed to parse audit array: %m");
 
-                        if (r == 0) {
+                        if (r == 0)
                                 /* Couldn't process as generic field, let's just skip over it */
                                 p += strcspn(p, WHITESPACE);
-                        }
                 }
         }
 }

diff --git a/src/journal/test-journal-verify.c b/src/journal/test-journal-verify.c
index d24502d9a88dc11cbe79a642f331a96159b554c9..9dd9cb853f7a2ae4391cfcd7ee39b544c3f46515 100644 (file)
--- a/src/journal/test-journal-verify.c
+++ b/src/journal/test-journal-verify.c
@@ -118,12 +118,11 @@ int main(int argc, char *argv[]) {
 
         assert_se(journal_file_verify(f, verification_key, &from, &to, &total, true) >= 0);
 
-        if (verification_key && JOURNAL_HEADER_SEALED(f->header)) {
+        if (verification_key && JOURNAL_HEADER_SEALED(f->header))
                 log_info("=> Validated from %s to %s, %s missing",
                          format_timestamp(a, sizeof(a), from),
                          format_timestamp(b, sizeof(b), to),
                          format_timespan(c, sizeof(c), total > to ? total - to : 0, 0));
-        }
 
         journal_file_close(f);
 

diff --git a/src/libsystemd-network/sd-ipv4ll.c b/src/libsystemd-network/sd-ipv4ll.c
index 0fc05e1484528b7781bda4777354fc5fe7444072..14b9444dab0ef0d842a85348ac19c14c88b47dc6 100644 (file)
--- a/src/libsystemd-network/sd-ipv4ll.c
+++ b/src/libsystemd-network/sd-ipv4ll.c
@@ -463,9 +463,8 @@ int sd_ipv4ll_get_address(sd_ipv4ll *ll, struct in_addr *address){
         assert_return(ll, -EINVAL);
         assert_return(address, -EINVAL);
 
-        if (ll->claimed_address == 0) {
+        if (ll->claimed_address == 0)
                 return -ENOENT;
-        }
 
         address->s_addr = ll->claimed_address;
         return 0;

diff --git a/src/libsystemd/sd-bus/bus-creds.c b/src/libsystemd/sd-bus/bus-creds.c
index 99b9aa8084ac88326b2b57c8745bee0ef590abc9..6826e2166545afc59e1977e686ade02b27d845aa 100644 (file)
--- a/src/libsystemd/sd-bus/bus-creds.c
+++ b/src/libsystemd/sd-bus/bus-creds.c
@@ -1014,9 +1014,8 @@ int bus_creds_add_more(sd_bus_creds *c, uint64_t mask, pid_t pid, pid_t tid) {
                         if (r != -EPERM && r != -EACCES)
                                 return r;
                 } else {
-                        if (c->cmdline_size == 0) {
+                        if (c->cmdline_size == 0)
                                 c->cmdline = mfree(c->cmdline);
-                        }
 
                         c->mask |= SD_BUS_CREDS_CMDLINE;
                 }

diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c
index e2a10ae2b401fab61417e9b4c2122192d20d7295..7ac89498300ecf3ebcd7968435a1eb30207c514e 100644 (file)
--- a/src/libsystemd/sd-netlink/netlink-message.c
+++ b/src/libsystemd/sd-netlink/netlink-message.c
@@ -898,10 +898,9 @@ int sd_netlink_message_rewind(sd_netlink_message *m) {
 
         m->n_containers = 0;
 
-        if (m->containers[0].attributes) {
+        if (m->containers[0].attributes)
                 /* top-level attributes have already been parsed */
                 return 0;
-        }
 
         assert(m->hdr);
 

diff --git a/src/login/logind-button.c b/src/login/logind-button.c
index cc98f5450ebfb714e5af214f8230095cca44d7ae..f40e35a8cbbf60ffec2eb369fd7f3b24ddca6e7b 100644 (file)
--- a/src/login/logind-button.c
+++ b/src/login/logind-button.c
@@ -66,12 +66,11 @@ void button_free(Button *b) {
         sd_event_source_unref(b->io_event_source);
         sd_event_source_unref(b->check_event_source);
 
-        if (b->fd >= 0) {
+        if (b->fd >= 0)
                 /* If the device has been unplugged close() returns
                  * ENODEV, let's ignore this, hence we don't use
                  * safe_close() */
                 (void) close(b->fd);
-        }
 
         free(b->name);
         free(b->seat);

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index bb8c5ac64b6f92bbbf3eb779725ec6816287796e..7b8f6d1fabe3deaad7a9fe08c96124967744180d 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -597,7 +597,7 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
                 printf("\t    Unit: %s\n", i->unit);
                 show_unit_cgroup(bus, i->unit, i->leader);
 
-                if (arg_transport == BUS_TRANSPORT_LOCAL) {
+                if (arg_transport == BUS_TRANSPORT_LOCAL)
 
                         show_journal_by_unit(
                                         stdout,
@@ -611,7 +611,6 @@ static void print_machine_status_info(sd_bus *bus, MachineStatusInfo *i) {
                                         SD_JOURNAL_LOCAL_ONLY,
                                         true,
                                         NULL);
-                }
         }
 }
 

diff --git a/src/network/networkd-netdev-bond.c b/src/network/networkd-netdev-bond.c
index a60034dbe631bbbd86021bb7d9938737ca958702..12e23216743ae87b9b68a51c1edcf859df6695ad 100644 (file)
--- a/src/network/networkd-netdev-bond.c
+++ b/src/network/networkd-netdev-bond.c
@@ -204,9 +204,8 @@ static int netdev_bond_fill_message_create(NetDev *netdev, Link *link, sd_netlin
         if (b->lacp_rate != _NETDEV_BOND_LACP_RATE_INVALID &&
             b->mode == NETDEV_BOND_MODE_802_3AD) {
                 r = sd_netlink_message_append_u8(m, IFLA_BOND_AD_LACP_RATE, b->lacp_rate );
-                if (r < 0) {
+                if (r < 0)
                         return log_netdev_error_errno(netdev, r, "Could not append IFLA_BOND_AD_LACP_RATE attribute: %m");
-                }
         }
 
         if (b->miimon != 0) {

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 92176b1e9f9b222855c286c64c8827c06a7819e9..f4778fc16a7d04e938da87478baedf46a1935e63 100644 (file)
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -54,10 +54,9 @@ int main(int argc, char *argv[]) {
         /* Read pool size, if possible */
         f = fopen("/proc/sys/kernel/random/poolsize", "re");
         if (f) {
-                if (fscanf(f, "%zu", &buf_size) > 0) {
+                if (fscanf(f, "%zu", &buf_size) > 0)
                         /* poolsize is in bits on 2.6, but we want bytes */
                         buf_size /= 8;
-                }
 
                 fclose(f);
         }

diff --git a/src/resolve-host/resolve-host.c b/src/resolve-host/resolve-host.c
index 9847effb5334ffac1a08033cadf23587961e3292..22af092cc0b3cdcf0a863755472463bf39320062 100644 (file)
--- a/src/resolve-host/resolve-host.c
+++ b/src/resolve-host/resolve-host.c
@@ -168,11 +168,10 @@ static int resolve_host(sd_bus *bus, const char *name) {
         if (r < 0)
                 return bus_log_parse_error(r);
 
-        if (!streq(name, canonical)) {
+        if (!streq(name, canonical))
                 printf("%*s%s (%s)\n",
                        (int) strlen(name), c == 0 ? name : "", c == 0 ? ":" : " ",
                        canonical);
-        }
 
         if (c == 0) {
                 log_error("%s: no addresses found", name);

diff --git a/src/resolve/resolved-dns-cache.c b/src/resolve/resolved-dns-cache.c
index ef6b69c768e64a06332496e81063c67bf7fcc426..cbbbed8c8a418f7eed75630e62a33637866f305a 100644 (file)
--- a/src/resolve/resolved-dns-cache.c
+++ b/src/resolve/resolved-dns-cache.c
@@ -241,12 +241,11 @@ static void dns_cache_item_update_positive(DnsCache *c, DnsCacheItem *i, DnsReso
 
         i->type = DNS_CACHE_POSITIVE;
 
-        if (!i->by_key_prev) {
+        if (!i->by_key_prev)
                 /* We are the first item in the list, we need to
                  * update the key used in the hashmap */
 
                 assert_se(hashmap_replace(c->by_key, rr->key, i) >= 0);
-        }
 
         dns_resource_record_ref(rr);
         dns_resource_record_unref(i->rr);

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 9a5ffb7a6ca670f2245156e88f6ac2495a61ccca..7790c1a3c80c7f3b659150e338c52bf33d215c9e 100644 (file)
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -334,10 +334,9 @@ static int output_short(
                         break;
                 case OUTPUT_SHORT_PRECISE:
                         r = strftime(buf, sizeof(buf), "%b %d %H:%M:%S", gettime_r(&t, &tm));
-                        if (r > 0) {
+                        if (r > 0)
                                 snprintf(buf + strlen(buf), sizeof(buf) - strlen(buf),
                                          ".%06llu", (unsigned long long) (x % USEC_PER_SEC));
-                        }
                         break;
                 default:
                         r = strftime(buf, sizeof(buf), "%b %d %H:%M:%S", gettime_r(&t, &tm));

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 96c39aa0a9a10bfd7af09dc04edd8c7a50ab9eb3..a82b9b83a2356ad9939c544f16bd2cecbef7f6ca 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -3585,7 +3585,7 @@ static void print_status_info(
                 }
         }
 
-        if (i->id && arg_transport == BUS_TRANSPORT_LOCAL) {
+        if (i->id && arg_transport == BUS_TRANSPORT_LOCAL)
                 show_journal_by_unit(
                                 stdout,
                                 i->id,
@@ -3598,7 +3598,6 @@ static void print_status_info(
                                 SD_JOURNAL_LOCAL_ONLY,
                                 arg_scope == UNIT_FILE_SYSTEM,
                                 ellipsized);
-        }
 
         if (i->need_daemon_reload)
                 warn_unit_file_changed(i->id);

diff --git a/src/udev/net/ethtool-util.c b/src/udev/net/ethtool-util.c
index 927b8abc64f335943566bcd07e13700446b09d32..a4b05d1becd5a6b261ef67fbe6e05bca59924fb4 100644 (file)
--- a/src/udev/net/ethtool-util.c
+++ b/src/udev/net/ethtool-util.c
@@ -54,9 +54,8 @@ int ethtool_connect(int *ret) {
         assert_return(ret, -EINVAL);
 
         fd = socket(PF_INET, SOCK_DGRAM, 0);
-        if (fd < 0) {
+        if (fd < 0)
                 return -errno;
-        }
 
         *ret = fd;
 

diff --git a/src/udev/scsi_id/scsi_serial.c b/src/udev/scsi_id/scsi_serial.c
index 3691a69d48edb4674903fb0960038058778c0a3f..69260cb1a05faf2ea2163c847f4de0f9b98b8b87 100644 (file)
--- a/src/udev/scsi_id/scsi_serial.c
+++ b/src/udev/scsi_id/scsi_serial.c
@@ -577,9 +577,8 @@ static int check_fill_0x83_id(struct udev *udev,
 
         if (id_search->id_type == SCSI_ID_NAA && wwn != NULL) {
                 strncpy(wwn, &serial[s], 16);
-                if (wwn_vendor_extension != NULL) {
+                if (wwn_vendor_extension != NULL)
                         strncpy(wwn_vendor_extension, &serial[s + 16], 16);
-                }
         }
 
         return 0;

diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 12bc6029b3f07bd1eaf14a7eb57a18f53f37f9b7..56277f551fef769e363f3f3f0651279f2648823b 100644 (file)
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -121,14 +121,12 @@ int udev_ctrl_enable_receiving(struct udev_ctrl *uctrl) {
                         err = bind(uctrl->sock, &uctrl->saddr.sa, uctrl->addrlen);
                 }
 
-                if (err < 0) {
+                if (err < 0)
                         return log_error_errno(errno, "bind failed: %m");
-                }
 
                 err = listen(uctrl->sock, 0);
-                if (err < 0) {
+                if (err < 0)
                         return log_error_errno(errno, "listen failed: %m");
-                }
 
                 uctrl->bound = true;
                 uctrl->cleanup_socket = true;

diff --git a/src/udev/udev-rules.c b/src/udev/udev-rules.c
index 62e21e13a7fef044041c87c2334566518a2d63b4..822f292217ecc055a702b5ad53c212afa18c59b9 100644 (file)
--- a/src/udev/udev-rules.c
+++ b/src/udev/udev-rules.c
@@ -672,9 +672,8 @@ static int import_parent_into_properties(struct udev_device *dev, const char *fi
                 const char *key = udev_list_entry_get_name(list_entry);
                 const char *val = udev_list_entry_get_value(list_entry);
 
-                if (fnmatch(filter, key, 0) == 0) {
+                if (fnmatch(filter, key, 0) == 0)
                         udev_device_add_property(dev, key, val);
-                }
         }
         return 0;
 }

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index f354ced2e271908d530533710ca5256a4b3482b6..20497ae8be6b88f72c39a5ad45ed8dcde65c5d0b 100644 (file)
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1670,9 +1670,8 @@ int main(int argc, char *argv[]) {
 
                 arg_children_max = 8;
 
-                if (sched_getaffinity(0, sizeof (cpu_set), &cpu_set) == 0) {
+                if (sched_getaffinity(0, sizeof(cpu_set), &cpu_set) == 0)
                         arg_children_max += CPU_COUNT(&cpu_set) * 2;
-                }
 
                 log_debug("set children_max to %u", arg_children_max);
         }

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index a91c3353814ced4cb8901d552cea22eb699a1e67..b2998dce43c409401b3f731443f5efc5bcce5c33 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -210,11 +210,9 @@ static int on_runlevel(Context *c) {
                              runlevel > 0 ? runlevel : 'N') < 0)
                         return log_oom();
 
-                if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 &&
-                    errno != EPERM) {
+                if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_RUNLEVEL, s, "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 && errno != EPERM)
                         r = log_error_errno(errno,
                                             "Failed to send audit message: %m");
-                }
         }
 #endif
 

diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index 4dd4e87b86639792e17f3d409941cdf498aa97fb..7c736c44d25e45fc3ee746017537194fd7512f57 100644 (file)
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -42,10 +42,9 @@ int main(int argc, char*argv[]) {
         if (streq(argv[1], "start")) {
                 int r = 0;
 
-                if (unlink("/run/nologin") < 0 && errno != ENOENT) {
+                if (unlink("/run/nologin") < 0 && errno != ENOENT)
                         r = log_error_errno(errno,
                                             "Failed to remove /run/nologin file: %m");
-                }
 
                 if (unlink("/etc/nologin") < 0 && errno != ENOENT) {
                         /* If the file doesn't exist and /etc simply