various: use empty block not break after OPTION_GROUP

Use the same style everywhere.

diff --git a/src/bootctl/bootctl.c b/src/bootctl/bootctl.c
index 9ec25962853b47f94c61d5989a52e32eafcdb813..59a93d07c3f225b0fee34b1c0f160b50c8d03883 100644 (file)
--- a/src/bootctl/bootctl.c
+++ b/src/bootctl/bootctl.c
@@ -422,8 +422,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
         FOREACH_OPTION(&state, c, &arg, /* on_error= */ return c)
                 switch (c) {
 
-                OPTION_GROUP("Block Device Discovery Commands"):
-                        break;
+                OPTION_GROUP("Block Device Discovery Commands"): {}
 
                 OPTION('p', "print-esp-path", NULL, "Print path to the EFI System Partition mount point"): {}
                 OPTION_LONG("print-path", NULL, /* help= */ NULL):  /* Compatibility alias */
@@ -455,8 +454,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                         arg_print_efi_architecture = true;
                         break;
 
-                OPTION_GROUP("Options"):
-                        break;
+                OPTION_GROUP("Options"): {}
 
                 OPTION_COMMON_HELP:
                         return help();

diff --git a/src/imds/imdsd.c b/src/imds/imdsd.c
index 8ab349865660202133613b3338ac403f0146bee4..b3d177116119e2203fbc17011eb6a67b1d38af2c 100644 (file)
--- a/src/imds/imdsd.c
+++ b/src/imds/imdsd.c
@@ -2348,8 +2348,7 @@ static int parse_argv(int argc, char *argv[]) {
                         break;
 
                 /* The following all configure endpoint information explicitly */
-                OPTION_GROUP("Manual Endpoint Configuration"):
-                        break;
+                OPTION_GROUP("Manual Endpoint Configuration"): {}
 
                 OPTION_LONG("vendor", "VENDOR", "Specify IMDS vendor literally"):
                         if (isempty(arg)) {

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 1f79e2face5e41f05b5c3ee262f96ec3c8c77969..ff391cb31657891bcad972d6c157871a5f3cb094 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -2121,8 +2121,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 OPTION_COMMON_VERSION:
                         return version();
 
-                OPTION_GROUP("Options"):
-                        break;
+                OPTION_GROUP("Options"): {}
 
                 OPTION_LONG("root", "PATH", "Operate on an alternate filesystem root"):
                         r = parse_path_argument(arg, /* suppress_root= */ false, &arg_root);

diff --git a/src/test/test-options.c b/src/test/test-options.c
index 687bafd4a2b9b671365f6b2be11fb4524fe24acd..1c9073b7a56d7ccae3ddbff429505dfa92c39552 100644 (file)
--- a/src/test/test-options.c
+++ b/src/test/test-options.c
@@ -811,8 +811,7 @@ static void test_macros_parse_one(
                         break;
 
                 /* OPTION_GROUP: group marker (never returned by parser) */
-                OPTION_GROUP("Advanced"):
-                        break;
+                OPTION_GROUP("Advanced"): {}
 
                 /* OPTION_LONG: long only, in the "Advanced" group */
                 OPTION_LONG("debug", NULL, "Enable debug mode"):

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 9975ffca3935db9c0b2a7ea92026f1926ba93cd9..0c133b08c84fe3761b60ede62e6e22bd0dac481e 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -4225,8 +4225,7 @@ static int parse_argv(int argc, char *argv[], char ***ret_args) {
                 OPTION_COMMON_VERSION:
                         return version();
 
-                OPTION_GROUP("Options"):
-                        break;
+                OPTION_GROUP("Options"): {}
 
                 OPTION_LONG("user", NULL, "Execute user configuration"):
                         arg_runtime_scope = RUNTIME_SCOPE_USER;

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index fa8c3402ffc1ac6c19dfe24bcfbe00a7df98c36a..fef8353a2c812ce6733bfeb3d5270c1b814e5edc 100644 (file)
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -359,8 +359,7 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_runtime_scope = RUNTIME_SCOPE_USER;
                         break;
 
-                OPTION_GROUP("Image"):
-                        break;
+                OPTION_GROUP("Image"): {}
 
                 OPTION('D', "directory", "PATH", "Root directory for the VM"):
                         r = parse_path_argument(arg, /* suppress_root= */ false, &arg_directory);
@@ -393,8 +392,7 @@ static int parse_argv(int argc, char *argv[]) {
                                                        "Invalid image disk type: %s", arg);
                         break;
 
-                OPTION_GROUP("Host Configuration"):
-                        break;
+                OPTION_GROUP("Host Configuration"): {}
 
                 OPTION_LONG("cpus", "CPUS", "Configure number of CPUs in guest"): {}
                 OPTION_LONG("qemu-smp", "CPUS", /* help= */ NULL):  /* Compat alias */
@@ -655,8 +653,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return log_error_errno(r, "Failed to parse --grow-image= parameter: %s", arg);
                         break;
 
-                OPTION_GROUP("Execution"):
-                        break;
+                OPTION_GROUP("Execution"): {}
 
                 OPTION('s', "smbios11", "STRING", "Pass an arbitrary SMBIOS Type #11 string to the VM"):
                         if (isempty(arg)) {
@@ -677,8 +674,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return r;
                         break;
 
-                OPTION_GROUP("System Identity"):
-                        break;
+                OPTION_GROUP("System Identity"): {}
 
                 OPTION('M', "machine", "NAME", "Set the machine name for the VM"):
                         if (isempty(arg))
@@ -702,8 +698,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return log_error_errno(r, "Invalid UUID: %s", arg);
                         break;
 
-                OPTION_GROUP("Properties"):
-                        break;
+                OPTION_GROUP("Properties"): {}
 
                 OPTION('S', "slice", "SLICE", "Place the VM in the specified slice"): {
                         _cleanup_free_ char *mangled = NULL;
@@ -732,8 +727,7 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_keep_unit = true;
                         break;
 
-                OPTION_GROUP("User Namespacing"):
-                        break;
+                OPTION_GROUP("User Namespacing"): {}
 
                 OPTION_LONG("private-users", "UIDBASE[:NUIDS]",
                             "Configure the UID/GID range to map into the virtiofsd namespace"):
@@ -742,8 +736,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return r;
                         break;
 
-                OPTION_GROUP("Mounts"):
-                        break;
+                OPTION_GROUP("Mounts"): {}
 
                 OPTION_LONG("bind", "SOURCE[:TARGET]", "Mount a file or directory from the host into the VM"): {}
                 OPTION_LONG("bind-ro", "SOURCE[:TARGET]", "Mount a file or directory, but read-only"): {
@@ -835,8 +828,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return log_oom();
                         break;
 
-                OPTION_GROUP("Integration"):
-                        break;
+                OPTION_GROUP("Integration"): {}
 
                 OPTION_LONG("forward-journal", "FILE|DIR", "Forward the VM's journal to the host"):
                         r = parse_path_argument(arg, /* suppress_root= */ false, &arg_forward_journal);
@@ -864,8 +856,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return r;
                         break;
 
-                OPTION_GROUP("Input/Output"):
-                        break;
+                OPTION_GROUP("Input/Output"): {}
 
                 OPTION_LONG("console", "MODE",
                             "Console mode (interactive, native, gui, read-only or headless)"):
@@ -890,8 +881,7 @@ static int parse_argv(int argc, char *argv[]) {
                                 return r;
                         break;
 
-                OPTION_GROUP("Credentials"):
-                        break;
+                OPTION_GROUP("Credentials"): {}
 
                 OPTION_LONG("set-credential", "ID:VALUE", "Pass a credential with literal value to the VM"):
                         r = machine_credential_set(&arg_credentials, arg);