Remove unneded {}s

keszybz · poettering · commit 38cd55b007c9 · 2020-04-13T09:31:49.000+02:00
$ perl -i -0pe 's|\s+{\n([^\n]*;)\n\s+}\n|\n\1\n|gms' **/*.c Inspired by ea7cbf5.
diff --git a/src/boot/efi/measure.c b/src/boot/efi/measure.c
@@ -302,9 +302,8 @@ EFI_STATUS tpm_log_event(UINT32 pcrindex, const EFI_PHYSICAL_ADDRESS buffer, UIN
         EFI_TCG2 *tpm2;
 
         tpm2 = tcg2_interface_check();
-        if (tpm2) {
+        if (tpm2)
                 return tpm2_measure_to_pcr_and_event_log(tpm2, pcrindex, buffer, buffer_size, description);
-        }
 
         tpm1 = tcg1_interface_check();
         if (tpm1)
diff --git a/src/core/transaction.c b/src/core/transaction.c
@@ -336,9 +336,8 @@ static char* merge_unit_ids(const char* unit_log_field, char **pairs) {
 
         STRV_FOREACH_PAIR(unit_id, job_type, pairs) {
                 next = strlen(unit_log_field) + strlen(*unit_id);
-                if (!GREEDY_REALLOC(ans, alloc, size + next + 1)) {
+                if (!GREEDY_REALLOC(ans, alloc, size + next + 1))
                         return mfree(ans);
-                }
 
                 sprintf(ans + size, "%s%s", unit_log_field, *unit_id);
                 if (*(unit_id+1))
diff --git a/src/home/homectl.c b/src/home/homectl.c
@@ -535,9 +535,8 @@ static int inspect_home(int argc, char *argv[], void *userdata) {
                         }
 
                         r = bus_call_method(bus, &home_mgr, "GetUserRecordByName", &error, &reply, "s", *i);
-                } else {
+                } else
                         r = bus_call_method(bus, &home_mgr, "GetUserRecordByUID", &error, &reply, "u", (uint32_t) uid);
-                }
 
                 if (r < 0) {
                         log_error_errno(r, "Failed to inspect home: %s", bus_error_message(&error, r));
diff --git a/src/import/curl-util.c b/src/import/curl-util.c
@@ -166,9 +166,8 @@ CurlGlue *curl_glue_unref(CurlGlue *g) {
         if (g->curl)
                 curl_multi_cleanup(g->curl);
 
-        while ((io = hashmap_steal_first(g->ios))) {
+        while ((io = hashmap_steal_first(g->ios)))
                 sd_event_source_unref(io);
-        }
 
         hashmap_free(g->ios);
 
diff --git a/src/journal/test-catalog.c b/src/journal/test-catalog.c
@@ -116,9 +116,8 @@ static void test_catalog_import_merge(void) {
         h = test_import(input, -1, 0);
         assert_se(ordered_hashmap_size(h) == 1);
 
-        ORDERED_HASHMAP_FOREACH(payload, h, j) {
+        ORDERED_HASHMAP_FOREACH(payload, h, j)
                 assert_se(streq(combined, payload));
-        }
 }
 
 static void test_catalog_import_merge_no_body(void) {
@@ -149,9 +148,8 @@ static void test_catalog_import_merge_no_body(void) {
         h = test_import(input, -1, 0);
         assert_se(ordered_hashmap_size(h) == 1);
 
-        ORDERED_HASHMAP_FOREACH(payload, h, j) {
+        ORDERED_HASHMAP_FOREACH(payload, h, j)
                 assert_se(streq(combined, payload));
-        }
 }
 
 static void test_catalog_update(const char *database) {
diff --git a/src/locale/keymap-util.c b/src/locale/keymap-util.c
@@ -267,9 +267,8 @@ int x11_read_data(Context *c, sd_bus_message *m) {
                                 else if (streq(a[1], "XkbOptions"))
                                         p = &c->x11_options;
 
-                                if (p) {
+                                if (p)
                                         free_and_replace(*p, a[2]);
-                                }
                         }
 
                 } else if (!in_section && first_word(l, "Section")) {
diff --git a/src/test/test-strv.c b/src/test/test-strv.c
@@ -408,9 +408,8 @@ static void test_strv_split_newlines(void) {
         l = strv_split_newlines(str);
         assert_se(l);
 
-        STRV_FOREACH(s, l) {
+        STRV_FOREACH(s, l)
                 assert_se(streq(*s, input_table_multiple[i++]));
-        }
 }
 
 static void test_strv_split_nulstr(void) {
diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c
@@ -514,19 +514,17 @@ int main(int argc, char *argv[]) {
                                 printf("ID_TYPE=generic\n");
                                 break;
                         }
-                } else {
+                } else
                         printf("ID_TYPE=disk\n");
-                }
                 printf("ID_BUS=ata\n");
                 printf("ID_MODEL=%s\n", model);
                 printf("ID_MODEL_ENC=%s\n", model_enc);
                 printf("ID_REVISION=%s\n", revision);
                 if (serial[0] != '\0') {
                         printf("ID_SERIAL=%s_%s\n", model, serial);
                         printf("ID_SERIAL_SHORT=%s\n", serial);
-                } else {
+                } else
                         printf("ID_SERIAL=%s\n", model);
-                }
 
                 if (id.command_set_1 & (1<<5)) {
                         printf("ID_ATA_WRITE_CACHE=1\n");
diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
@@ -111,9 +111,8 @@ static char *get_value(char **buffer) {
                  */
                 (*buffer)++;
                 end = quote_string;
-        } else {
+        } else
                 end = comma_string;
-        }
         val = strsep(buffer, end);
         if (val && end == quote_string)
                 /*
diff --git a/src/udev/udev-builtin-input_id.c b/src/udev/udev-builtin-input_id.c
@@ -228,9 +228,8 @@ static bool test_pointers(sd_device *dev,
                         is_touchscreen = true;
                 else if (has_joystick_axes_or_buttons)
                         is_joystick = true;
-        } else if (has_joystick_axes_or_buttons) {
+        } else if (has_joystick_axes_or_buttons)
                 is_joystick = true;
-        }
 
         if (has_mt_coordinates) {
                 if (stylus_or_pen)
diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
@@ -125,9 +125,8 @@ static int on_reboot(Context *c) {
 #if HAVE_AUDIT
         if (c->audit_fd >= 0)
                 if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_BOOT, "", "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 &&
-                    errno != EPERM) {
+                    errno != EPERM)
                         r = log_error_errno(errno, "Failed to send audit message: %m");
-                }
 #endif
 
         /* If this call fails it will return 0, which
@@ -154,9 +153,8 @@ static int on_shutdown(Context *c) {
 #if HAVE_AUDIT
         if (c->audit_fd >= 0)
                 if (audit_log_user_comm_message(c->audit_fd, AUDIT_SYSTEM_SHUTDOWN, "", "systemd-update-utmp", NULL, NULL, NULL, 1) < 0 &&
-                    errno != EPERM) {
+                    errno != EPERM)
                         r = log_error_errno(errno, "Failed to send audit message: %m");
-                }
 #endif
 
         q = utmp_put_shutdown();

Original file line number	Diff line number	Diff line change
`@@ -535,9 +535,8 @@ static int inspect_home(int argc, char argv[], void userdata) {`
`535`	`535`	`}`
`536`	`536`
`537`	`537`	`r = bus_call_method(bus, &home_mgr, "GetUserRecordByName", &error, &reply, "s", *i);`
`538`		`- } else {`
	`538`	`+ } else`
`539`	`539`	`r = bus_call_method(bus, &home_mgr, "GetUserRecordByUID", &error, &reply, "u", (uint32_t) uid);`
`540`		`- }`
`541`	`540`
`542`	`541`	`if (r < 0) {`
`543`	`542`	`log_error_errno(r, "Failed to inspect home: %s", bus_error_message(&error, r));`
Original file line number	Diff line number	Diff line change
`@@ -267,9 +267,8 @@ int x11_read_data(Context c, sd_bus_message m) {`
`267`	`267`	`else if (streq(a[1], "XkbOptions"))`
`268`	`268`	`p = &c->x11_options;`
`269`	`269`
`270`		`- if (p) {`
	`270`	`+ if (p)`
`271`	`271`	`free_and_replace(*p, a[2]);`
`272`		`- }`
`273`	`272`	`}`
`274`	`273`
`275`	`274`	`} else if (!in_section && first_word(l, "Section")) {`
Original file line number	Diff line number	Diff line change
`@@ -408,9 +408,8 @@ static void test_strv_split_newlines(void) {`
`408`	`408`	`l = strv_split_newlines(str);`
`409`	`409`	`assert_se(l);`
`410`	`410`
`411`		`- STRV_FOREACH(s, l) {`
	`411`	`+ STRV_FOREACH(s, l)`
`412`	`412`	`assert_se(streq(*s, input_table_multiple[i++]));`
`413`		`- }`
`414`	`413`	`}`
`415`	`414`
`416`	`415`	`static void test_strv_split_nulstr(void) {`