]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
tree-wide: drop unnecessary break in default branch
authorYu Watanabe <watanabe.yu+github@gmail.com>
Wed, 5 Mar 2025 13:30:48 +0000 (22:30 +0900)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Thu, 6 Mar 2025 10:42:20 +0000 (11:42 +0100)
64 files changed:
src/analyze/analyze-chid.c
src/analyze/analyze-image-policy.c
src/basic/string-util.c
src/boot/boot.c
src/cgtop/cgtop.c
src/core/automount.c
src/core/execute-serialize.c
src/core/main.c
src/core/mount.c
src/core/smack-setup.c
src/core/swap.c
src/coredump/coredump.c
src/detect-virt/detect-virt.c
src/dissect/dissect.c
src/fundamental/macro-fundamental.h
src/home/homework.c
src/home/pam_systemd_home.c
src/home/user-record-util.c
src/import/import-generator.c
src/import/importd.c
src/libsystemd-network/dhcp-option.c
src/libsystemd-network/sd-dhcp-client.c
src/libsystemd-network/sd-dhcp-lease.c
src/libsystemd-network/sd-dns-resolver.c
src/libsystemd-network/test-dhcp-client.c
src/libsystemd-network/test-ipv4ll.c
src/libsystemd/sd-bus/bus-message.c
src/libsystemd/sd-bus/bus-objects.c
src/libsystemd/sd-journal/journal-file.c
src/libsystemd/sd-json/sd-json.c
src/login/logind-button.c
src/login/logind-session-device.c
src/login/pam_systemd.c
src/network/netdev/l2tp-tunnel.c
src/network/netdev/tunnel.c
src/network/networkd-address.c
src/network/networkd-bridge-mdb.c
src/network/networkd-dhcp4.c
src/network/networkd-ipv4ll.c
src/network/networkd-route.c
src/network/networkd-setlink.c
src/pcrlock/pcrlock.c
src/resolve/resolved-bus.c
src/resolve/resolved-dns-packet.c
src/resolve/resolved-dns-query.c
src/resolve/resolved-dns-rr.c
src/resolve/resolved-manager.c
src/resolve/resolved-varlink.c
src/rfkill/rfkill.c
src/shared/bus-unit-util.c
src/shared/common-signal.c
src/shared/dissect-image.c
src/shared/journal-util.c
src/shared/libfido2-util.c
src/shared/seccomp-util.c
src/shared/user-record-show.c
src/systemctl/systemctl-list-dependencies.c
src/sysupdate/sysupdate-transfer.c
src/tmpfiles/tmpfiles.c
src/udev/ata_id/ata_id.c
src/udev/cdrom_id/cdrom_id.c
src/udev/mtd_probe/probe_smartmedia.c
src/udev/scsi_id/scsi_id.c
src/udev/udev-builtin-usb_id.c

index 0916e60c1fdd4372928af8d8df9b977b2029fe3b..5e68da3ebf9250a6dfa6f13ee15847c7cbdbc045 100644 (file)
@@ -212,7 +212,7 @@ static int smbios_fields_acquire(char16_t *fields[static _CHID_SMBIOS_FIELDS_MAX
                 }
 
                 default:
-                        break;
+                        ;
                 }
 
                 fields[f] = utf8_to_utf16(buf, size);
index 7d4f5498e840e1f832aa5b2f95b90044f3b83bc9..df4f62f6b8d3c2d31721aa27810215bd0164df44 100644 (file)
@@ -49,7 +49,6 @@ static int table_add_designator_line(Table *table, PartitionDesignator d, Partit
 
         default:
                 r = table_add_many(table, TABLE_EMPTY);
-                break;
         }
         if (r < 0)
                 return table_log_add_error(r);
@@ -66,9 +65,7 @@ static int table_add_designator_line(Table *table, PartitionDesignator d, Partit
 
         default:
                 r = table_add_many(table, TABLE_EMPTY);
-                break;
         }
-
         if (r < 0)
                 return table_log_add_error(r);
 
index 4748d5e2b552c22f50ea3cd528b119560d141f73..89c9dd4af19e24ce0c958dd6743d868b4baa3ae6 100644 (file)
@@ -335,10 +335,6 @@ static char *ascii_ellipsize_mem(const char *s, size_t old_length, size_t new_le
         case 2:
                 if (!is_locale_utf8())
                         return strdup("..");
-
-                break;
-
-        default:
                 break;
         }
 
index 54561e4af4e518ff22711585d95eaae633b9a435..cf36c105f669da084e65696c1c6d069c034c3c5c 100644 (file)
@@ -346,7 +346,6 @@ static void print_status(Config *config, char16_t *loaded_image_path) {
                 break;
         default:
                 printf(" console-mode (config): %" PRIi64 "\n", config->console_mode);
-                break;
         }
 
         /* EFI var console mode is always a concrete value or unset. */
index ce73599d90228f377ab0eb22ad55af0f86c56a73..62562910611df46d4251af2e8ebc3d68dc7707db 100644 (file)
@@ -1066,7 +1066,6 @@ static int loop(const char *root) {
                                 fprintf(stdout, "\nUnknown key '%c'. Ignoring.", key);
                         fflush(stdout);
                         sleep(1);
-                        break;
                 }
         }
 }
index 5ac5dec8d9da95f2bb212a2169b3ae675ee56db8..b4611981f2cd3c62f2f7c17d26b7e851f84fb8fc 100644 (file)
@@ -1006,7 +1006,6 @@ static int automount_dispatch_io(sd_event_source *s, int fd, uint32_t events, vo
 
         default:
                 log_unit_error(UNIT(a), "Received unknown automount request %i", packet.hdr.type);
-                break;
         }
 
         return 0;
index 0eec9cdf8fdc2ff121454a77ec2c6184c3019f1e..220b4be5caf12b9419dcebc5fed39d18f0252e2b 100644 (file)
@@ -2178,7 +2178,7 @@ static int exec_context_serialize(const ExecContext *c, FILE *f) {
                 break;
 
         default:
-                break;
+                ;
         }
 
         r = serialize_std_out_err(c, f, STDOUT_FILENO);
index e5b18b164cbc90c0068d9df8f741b97088343826..8a6a1338ae25b7083360889fb261cb4879f6231a 100644 (file)
@@ -1687,7 +1687,6 @@ static int become_shutdown(int objective, int retval) {
         case LOG_TARGET_CONSOLE:
         default:
                 command_line[pos++] = "--log-target=console";
-                break;
         };
 
         if (log_get_show_color())
index 361d8e031896a23e8f8cc029182a977f2e7df8ff..664f214f20aaa43831bf38a48dacfd569b341aa9 100644 (file)
@@ -773,7 +773,7 @@ static void mount_catchup(Unit *u) {
                         mount_set_state(m, MOUNT_MOUNTING_DONE);
                         break;
                 default:
-                        break;
+                        ;
                 }
         else
                 switch (m->state) {
@@ -786,7 +786,7 @@ static void mount_catchup(Unit *u) {
                         mount_enter_dead(m, MOUNT_SUCCESS, /* flush_result = */ false);
                         break;
                 default:
-                        break;
+                        ;
                 }
 }
 
@@ -2242,7 +2242,7 @@ static int mount_process_proc_self_mountinfo(Manager *m) {
                                 break;
 
                         default:
-                                break;
+                                ;
                         }
 
                 } else if (mount->proc_flags & (MOUNT_PROC_JUST_MOUNTED|MOUNT_PROC_JUST_CHANGED)) {
@@ -2270,7 +2270,6 @@ static int mount_process_proc_self_mountinfo(Manager *m) {
                                  * in case somebody is waiting for this. (e.g. file system ro/rw
                                  * remounts.) */
                                 mount_set_state(mount, mount->state);
-                                break;
                         }
                 }
 
index 7ea902b6f9cb59e0c3c1dcf8057cd08f63ebe698..150867b95803a9335253708e1d1293f24ecec921 100644 (file)
@@ -349,7 +349,6 @@ int mac_smack_setup(bool *loaded_policy) {
                 break;
         default:
                 log_warning_errno(r, "Failed to load Smack/CIPSO access rules, ignoring: %m");
-                break;
         }
 
         r = write_netlabel_rules("/etc/smack/netlabel.d/");
@@ -365,7 +364,6 @@ int mac_smack_setup(bool *loaded_policy) {
                 break;
         default:
                 log_warning_errno(r, "Failed to load Smack network host rules: %m, ignoring.");
-                break;
         }
 
         r = write_onlycap_list();
index 28afba3790170ce795a98c6a291a02f87840a782..16072e5a713814970c4a327a073edf288d06239e 100644 (file)
@@ -1190,7 +1190,6 @@ static int swap_process_proc_swaps(Manager *m) {
                         default:
                                 /* Fire again */
                                 swap_set_state(swap, swap->state);
-                                break;
                         }
 
                         if (swap->what)
@@ -1214,12 +1213,9 @@ static int swap_process_proc_swaps(Manager *m) {
                                 break;
 
                         default:
-                                /* Nothing really changed, but let's
-                                 * issue an notification call
-                                 * nonetheless, in case somebody is
-                                 * waiting for this. */
+                                /* Nothing really changed, but let's issue an notification call nonetheless,
+                                 * in case somebody is waiting for this. */
                                 swap_set_state(swap, swap->state);
-                                break;
                         }
                 }
 
index a61bd01c164b2e3db1d6413d96b2f839054adf84..21fb48a9ac79795eae6f5d966d6f76bec9e51c94 100644 (file)
@@ -1633,7 +1633,7 @@ static int forward_coredump_to_container(Context *context) {
                                 break;
 
                         default:
-                                break;
+                                ;
                         }
 
                         r = iovw_put_string_field(iovw, meta_field_names[i], t);
index 2a65a3e6b8d1e68bc998123bbfc355cb9b7f1b35..9aa6c06748fb1521c91ec050f63e56564fde3e29 100644 (file)
@@ -190,7 +190,6 @@ static int run(int argc, char *argv[]) {
                 v = detect_virtualization();
                 if (v < 0)
                         return log_error_errno(v, "Failed to check for virtualization: %m");
-                break;
         }
 
         if (!arg_quiet)
index 3fa3ecb8721cf42410a34e843197253c1c853a36..f707d7df25676a97eb29340ebd587ef01871da52 100644 (file)
@@ -2154,7 +2154,7 @@ static int run(int argc, char *argv[]) {
 
         default:
                 /* All other actions need the image dissected (except for ACTION_VALIDATE, see below) */
-                break;
+                ;
         }
 
         if (arg_image) {
index d56dcb6eb6db8b4737bb1f982a0d7fb8ac93c3d3..bc7bd2f4924999118ec09e1206fe66757611c256 100644 (file)
                         _found = true;                                  \
                         break;                                          \
                 default:                                                \
-                        break;                                          \
+                        ;                                               \
                 }                                                       \
                 _found;                                                 \
         })
index 7eb42e1dac6f98382b3d3f31cd727c798a471ffc..51adce5f3cd1b996ccce006fe7b7ed30f281edfe 100644 (file)
@@ -1790,7 +1790,7 @@ static int home_passwd(UserRecord *h, UserRecord **ret_home) {
                 break;
 
         default:
-                break;
+                ;
         }
 
         r = home_store_header_identity_luks(new_home, &setup, header_home);
index dcb85adc61d8c8bc2252af63a5e9fa982cc67e6a..e3a687ca64036ba0d722ded28d0481e4f5efe4b5 100644 (file)
@@ -1016,8 +1016,6 @@ _public_ PAM_EXTERN int pam_sm_acct_mgmt(
                         (void) pam_prompt_graceful(handle, PAM_ERROR_MSG, NULL, _("User record not valid, prohibiting access."));
                         return PAM_ACCT_EXPIRED;
                 }
-
-                break;
         }
 
         t = user_record_ratelimit_next_try(ur);
@@ -1067,8 +1065,6 @@ _public_ PAM_EXTERN int pam_sm_acct_mgmt(
                         (void) pam_prompt_graceful(handle, PAM_ERROR_MSG, NULL, _("User record not valid, prohibiting access."));
                         return PAM_AUTHTOK_EXPIRED;
                 }
-
-                break;
         }
 
         return PAM_SUCCESS;
index 907dd435126d716e706997fa074d5856f308c0fd..344ff73e7dd876e320fdaab0b0310afa617ce460 100644 (file)
@@ -1223,7 +1223,6 @@ int user_record_good_authentication(UserRecord *h) {
                 break;
         default:
                 counter = h->good_authentication_counter + 1;
-                break;
         }
 
         usec = now(CLOCK_REALTIME);
@@ -1279,7 +1278,6 @@ int user_record_bad_authentication(UserRecord *h) {
                 break;
         default:
                 counter = h->bad_authentication_counter + 1;
-                break;
         }
 
         usec = now(CLOCK_REALTIME);
index 3e052e54ec1de1cef1153f37af73e5f002400450..ad81b72355940e5ee16b07339ecada00fe57b3c2 100644 (file)
@@ -181,7 +181,6 @@ static int parse_pull_expression(const char *v) {
 
                 default:
                         assert_not_reached();
-                        break;
                 }
                 if (r < 0)
                         return log_error_errno(r, "Failed to strip suffix from URL '%s': %m", remote);
index 34222c133e1b5c6d8aeca9765de1823e7919796a..ad1cc93b769ae4fa27497ae4ca2e14a4dedea3d1 100644 (file)
@@ -524,7 +524,7 @@ static int transfer_start(Transfer *t) {
                         break;
 
                 default:
-                        break;
+                        ;
                 }
 
                 if (t->verify != _IMPORT_VERIFY_INVALID) {
index e4ba77ae29648bd05db1477d8e54c43b99be024c..4945acfd563fac555cbec7dc92dc77531902d611 100644 (file)
@@ -345,8 +345,6 @@ static int parse_options(const uint8_t options[], size_t buflen, uint8_t *overlo
                 default:
                         if (cb)
                                 cb(code, len, option, userdata);
-
-                        break;
                 }
 
                 offset += len;
index 5d733baa571c17c101d8c871338eeef91ad2af1d..566da47638e2d7120361b970a0642c03c5ab5b37 100644 (file)
@@ -203,7 +203,7 @@ int sd_dhcp_client_set_request_option(sd_dhcp_client *client, uint8_t option) {
                 return -EINVAL;
 
         default:
-                break;
+                ;
         }
 
         return set_ensure_put(&client->req_opts, NULL, UINT8_TO_PTR(option));
@@ -1188,7 +1188,6 @@ static int client_send_request(sd_dhcp_client *client) {
 
         default:
                 log_dhcp_client(client, "REQUEST (invalid)");
-                break;
         }
 
         return 0;
index fc891a0b045b2208d64a60d8be758f0f379a16c8..5aac8143cba708644fbf30b6bc0a44db87c49b0b 100644 (file)
@@ -1076,7 +1076,6 @@ int dhcp_lease_parse_options(uint8_t code, uint8_t len, const void *option, void
 
         default:
                 log_debug("Ignoring DHCP option %"PRIu8" while parsing.", code);
-                break;
         }
 
         return 0;
index 5b4ed6e23aae7dc12a719fa64974d5b36267eef2..b24152f17e7d4b06212620fa7956a479227a0eca 100644 (file)
@@ -293,7 +293,7 @@ int dnr_parse_svc_params(const uint8_t *option, size_t len, sd_dns_resolver *res
                         break;
 
                 default:
-                        break;
+                        ;
                 }
                 offset += plen;
         }
index a5732a6da4870d9dcc48454bbe6b59f5e571f58c..37ac827bd6668951fc094968e8045ffbb1724641 100644 (file)
@@ -163,8 +163,7 @@ static void test_dhcp_identifier_set_iaid(void) {
 
 static int check_options(uint8_t code, uint8_t len, const void *option, void *userdata) {
         switch (code) {
-        case SD_DHCP_OPTION_CLIENT_IDENTIFIER:
-        {
+        case SD_DHCP_OPTION_CLIENT_IDENTIFIER: {
                 sd_dhcp_duid duid;
                 uint32_t iaid;
 
@@ -181,7 +180,7 @@ static int check_options(uint8_t code, uint8_t len, const void *option, void *us
         }
 
         default:
-                break;
+                ;
         }
 
         return 0;
index e7dbd7f36fe76b9f313481211276181cafe17165..0dbc0873ba6c500a7801c11bf887b6d617aa172f 100644 (file)
@@ -37,7 +37,6 @@ static void basic_request_handler(sd_ipv4ll *ll, int event, void *userdata) {
                         break;
                 default:
                         assert_se(0);
-                        break;
         }
 }
 
index 808d52f876de033502dd55845425550ad8cb46bf..04981eac42f7fdb9790f2e6a8f8f0e6808e4d548 100644 (file)
@@ -1398,7 +1398,6 @@ int message_append_basic(sd_bus_message *m, char type, const void *p, const void
         default:
                 align = bus_type_get_alignment(type);
                 sz = bus_type_get_size(type);
-                break;
         }
 
         assert(align > 0);
index f23774504a0618e10ab48d0535e4f0c7fa0f65df..c10c8a46d4a238715e0fb0ed790bb89b5923c4d9 100644 (file)
@@ -481,7 +481,6 @@ static int invoke_property_get(
 
         default:
                 p = userdata;
-                break;
         }
 
         return sd_bus_message_append_basic(reply, v->x.property.signature[0], p);
@@ -554,8 +553,6 @@ static int invoke_property_set(
                 r = sd_bus_message_read_basic(value, v->x.property.signature[0], userdata);
                 if (r < 0)
                         return r;
-
-                break;
         }
 
         return 1;
index 40b441006039bc3253ac05bfdc9ecd7a90e0ce7e..fede9d438e8bf983972e5c4c8c6b610d9a187407 100644 (file)
@@ -254,9 +254,7 @@ static int journal_file_set_online(JournalFile *f) {
                                 return r;
 
                         wait = false;
-                        break;
-                }
-                }
+                }}
         }
 
         if (mmap_cache_fd_got_sigbus(f->cache_fd))
@@ -3822,8 +3820,6 @@ void journal_file_dump(JournalFile *f) {
                                 log_info("Type: %s \n", s);
                         else
                                 log_info("Type: unknown (%i)", o->object.type);
-
-                        break;
                 }
 
                 c = COMPRESSION_FROM_OBJECT(o);
index 99d941e1efdc064e117fa8f111e601292572c56d..4f641fbd71bbc09f941a81a59b03cd77c9b31b5c 100644 (file)
@@ -990,7 +990,7 @@ _public_ int64_t sd_json_variant_integer(sd_json_variant *v) {
         }
 
         default:
-                break;
+                ;
         }
 
 mismatch:
@@ -1035,7 +1035,7 @@ _public_ uint64_t sd_json_variant_unsigned(sd_json_variant *v) {
         }
 
         default:
-                break;
+                ;
         }
 
 mismatch:
@@ -1081,7 +1081,7 @@ _public_ double sd_json_variant_real(sd_json_variant *v) {
         }
 
         default:
-                break;
+                ;
         }
 
 mismatch:
@@ -1117,7 +1117,7 @@ _public_ int sd_json_variant_is_negative(sd_json_variant *v) {
                 return false;
 
         default:
-                break;
+                ;
         }
 
 mismatch:
@@ -1649,7 +1649,6 @@ static void json_format_string(FILE *f, const char *q, sd_json_format_flags_t fl
                                 fprintf(f, "\\u%04x", (unsigned) *q);
                         else
                                 fputc(*q, f);
-                        break;
                 }
 
         if (flags & SD_JSON_FORMAT_COLOR)
index bc49305fcd52478e8c2aed697177c599d58c4dee..bb290fed71a2336f0d0b6fd9ed43acd368c489c7 100644 (file)
@@ -338,7 +338,6 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                 default:
                         b->button_modifier_mask |= button_get_keycode_modifier_mask(ev.code);
-                        break;
                 }
 
         } else if (ev.type == EV_KEY && ev.value == 0) {
@@ -402,7 +401,6 @@ static int button_dispatch(sd_event_source *s, int fd, uint32_t revents, void *u
 
                 default:
                         b->button_modifier_mask &= ~button_get_keycode_modifier_mask(ev.code);
-                        break;
                 }
 
         } else if (ev.type == EV_SW && ev.value > 0) {
index f0730f751c35f207ddcda3d4fbefadde91ef1b56..1a22a77e8ea9a1e91d6ab43e3017834107728ca5 100644 (file)
@@ -171,7 +171,7 @@ static int session_device_open(SessionDevice *sd, bool active) {
         case DEVICE_TYPE_UNKNOWN:
         default:
                 /* fallback for devices without synchronizations */
-                break;
+                ;
         }
 
         return TAKE_FD(fd);
@@ -215,7 +215,7 @@ static int session_device_start(SessionDevice *sd) {
         case DEVICE_TYPE_UNKNOWN:
         default:
                 /* fallback for devices without synchronizations */
-                break;
+                ;
         }
 
         sd->active = true;
@@ -262,7 +262,7 @@ static void session_device_stop(SessionDevice *sd) {
         case DEVICE_TYPE_UNKNOWN:
         default:
                 /* fallback for devices without synchronization */
-                break;
+                ;
         }
 
         sd->active = false;
index 9406491c4a89521d2a2134d89a3b72f8f6591afd..a50d1228c2ac403764200dd5a6ab40800e1a49ab 100644 (file)
@@ -1074,7 +1074,7 @@ static void session_context_mangle(
                         break;
 
                 default:
-                        break;
+                        ;
                 }
 
                 pam_debug_syslog(handle, debug, "Automatically chose session class '%s'.", c->class);
index c87e44797baac945083f317a8791b2494a591599..a14bbd272e8220ab78c827991d9d0077b76350d5 100644 (file)
@@ -125,7 +125,6 @@ static int netdev_l2tp_create_message_tunnel(NetDev *netdev, union in_addr_union
         case NETDEV_L2TP_ENCAPTYPE_UDP:
         default:
                 encap_type = L2TP_ENCAPTYPE_UDP;
-                break;
         }
 
         r = sd_netlink_message_append_u16(m, L2TP_ATTR_ENCAP_TYPE, encap_type);
@@ -227,7 +226,6 @@ static int netdev_l2tp_create_message_session(NetDev *netdev, L2tpSession *sessi
         default:
                 l2_spec_type = L2TP_L2SPECTYPE_DEFAULT;
                 l2_spec_len = 4;
-                break;
         }
 
         r = sd_netlink_message_append_u8(m, L2TP_ATTR_L2SPEC_TYPE, l2_spec_type);
index af05cfda81a2208f5bb20760e5dabc0017c9fac6..e6f857c90c9ce06c5f709beda86aa7edbad97459 100644 (file)
@@ -574,7 +574,6 @@ static int netdev_ip6tnl_fill_message_create(NetDev *netdev, Link *link, sd_netl
         case NETDEV_IP6_TNL_MODE_ANYIP6:
         default:
                 proto = 0;
-                break;
         }
 
         r = sd_netlink_message_append_u8(m, IFLA_IPTUN_PROTO, proto);
index d35d2ed521ec0d6588add405b501baf2cb543b5e..e02a16b739bca7129bfebe8407f97b134eacfa96 100644 (file)
@@ -472,8 +472,7 @@ void address_hash_func(const Address *a, struct siphash *state) {
                 break;
 
         default:
-                /* treat any other address family as AF_UNSPEC */
-                break;
+                assert_not_reached();
         }
 }
 
@@ -515,8 +514,7 @@ int address_compare_func(const Address *a1, const Address *a2) {
                 return r;
 
         default:
-                /* treat any other address family as AF_UNSPEC */
-                return 0;
+                assert_not_reached();
         }
 }
 
index 80ef3c14585dbd2656b93fced9ac0d7d2f306de1..ba027bfa7c0f37ef8a73ecceedc9edfaf5ffb2ab 100644 (file)
@@ -293,7 +293,6 @@ static int bridge_mdb_verify(BridgeMDB *mdb) {
                                                          "%s: MulticastGroupAddress= is the multicast all nodes address. "
                                                          "Ignoring [BridgeMDB] section from line %u.",
                                                          mdb->section->filename, mdb->section->line);
-                        break;
                 }
                 break;
         default:
index 926e769258b30c2e767a7a6dc7dd9986dd4e54a7..706eba6d27648f48ea8050f2cb53b84b60ffa9f2 100644 (file)
@@ -1284,7 +1284,6 @@ static int dhcp4_handler(sd_dhcp_client *client, int event, void *userdata) {
                                 log_link_warning_errno(link, event, "DHCP error: Client failed: %m");
                         else
                                 log_link_warning(link, "DHCP unknown event: %i", event);
-                        break;
         }
 
         return 0;
index 046e4ca95712e301b50a54495573b7596b12f8c9..ef8b0876b57a6f23a238fd58c2c32a2697e73bee 100644 (file)
@@ -156,7 +156,6 @@ static void ipv4ll_handler(sd_ipv4ll *ll, int event, void *userdata) {
                         break;
                 default:
                         log_link_warning(link, "IPv4 link-local unknown event: %d", event);
-                        break;
         }
 }
 
index cdc1f307af02e4f0cfb0fa0daa53234f7387e706..c37011079cb598ce63e6840cb5d7bf871fbed2cf 100644 (file)
@@ -121,8 +121,7 @@ static void route_hash_func(const Route *route, struct siphash *state) {
                 break;
 
         default:
-                /* treat any other address family as AF_UNSPEC */
-                break;
+                assert_not_reached();
         }
 }
 
@@ -209,8 +208,7 @@ static int route_compare_func(const Route *a, const Route *b) {
                 return route_nexthops_compare_func(a, b);
 
         default:
-                /* treat any other address family as AF_UNSPEC */
-                return 0;
+                assert_not_reached();
         }
 }
 
index 2f4a6c6e035c8c6d63eb6b74f2464cc597cd8cb7..17c2b4b10eb3c5718abac40583dfaf2f81e60e42 100644 (file)
@@ -641,10 +641,10 @@ static int link_is_ready_to_set_link(Link *link, Request *req) {
                         return -EALREADY; /* Not necessary to set the same value. */
 
                 req->userdata = UINT32_TO_PTR(mtu);
-                return true;
+                break;
         }
         default:
-                break;
+                ;
         }
 
         return true;
index 002ca43edbec018fbe01de3a126126eda3e99824..0b7697ad69e36b6c23d2d9f89e607522bc08db99 100644 (file)
@@ -742,8 +742,6 @@ static int event_log_record_extract_firmware_description(EventLogRecord *rec) {
                                 r = strextendf_with_separator(&rec->description, ", ", "Tag 0x%" PRIx32 ": %s", tag->taggedEventID, s);
                                 if (r < 0)
                                         return log_error_errno(r, "Failed to format EV_EVENT_TAG description string: %m");
-
-                                break;
                         }}
 
                         tag = (TCG_PCClientTaggedEvent*) ((uint8_t*) tag + m);
@@ -1437,7 +1435,6 @@ static int event_log_record_validate_hash_firmware(
                 hdata = record->firmware_payload;
                 hsz = record->firmware_payload_size;
                 strict = false;
-                break;
         }
 
         int mdsz = EVP_MD_size(md);
index 61975de1d2e3589dc6cca5567ce307d496fb57f7..1f06a7d57d10a11538b748d0cc160a37cbf8b262 100644 (file)
@@ -1027,7 +1027,6 @@ static void resolve_service_all_complete(DnsQuery *query) {
 
                         default:
                                 bad = aux;
-                                break;
                         }
                 }
 
index 054ce5c3d16bbed5ec257a9c31d6382d099a9317..049262e6da28d96b80e2cbe423385c4fdd2fcf9b 100644 (file)
@@ -287,7 +287,7 @@ int dns_packet_validate_reply(DnsPacket *p) {
                 break;
 
         default:
-                break;
+                ;
         }
 
         return 1;
@@ -356,7 +356,7 @@ int dns_packet_validate_query(DnsPacket *p) {
                 break;
 
         default:
-                break;
+                ;
         }
 
         return 1;
@@ -1267,9 +1267,7 @@ int dns_packet_append_rr(DnsPacket *p, const DnsResourceRecord *rr, const DnsAns
         case DNS_TYPE_OPENPGPKEY:
         case _DNS_TYPE_INVALID: /* unparsable */
         default:
-
                 r = dns_packet_append_blob(p, rr->generic.data, rr->generic.data_size, NULL);
-                break;
         }
         if (r < 0)
                 goto fail;
@@ -2326,8 +2324,6 @@ int dns_packet_read_rr(
         default:
         unparsable:
                 r = dns_packet_read_memdup(p, rdlength, &rr->generic.data, &rr->generic.data_size, NULL);
-
-                break;
         }
         if (r < 0)
                 return r;
index 45223283196b63fbca94f2868c0752997dc534fa..4867ff0426e624c244af65e0eaca0412af069782 100644 (file)
@@ -254,8 +254,6 @@ static DnsTransactionState dns_query_candidate_state(DnsQueryCandidate *c) {
                 default:
                         if (state != DNS_TRANSACTION_SUCCESS)
                                 state = t->state;
-
-                        break;
                 }
 
         return state;
@@ -1047,7 +1045,6 @@ static void dns_query_accept(DnsQuery *q, DnsQueryCandidate *c) {
                         DNS_PACKET_REPLACE(q->answer_full_packet, dns_packet_ref(t->received));
 
                         state = t->state;
-                        break;
                 }
         }
 
@@ -1113,7 +1110,6 @@ void dns_query_ready(DnsQuery *q) {
                 default:
                         /* Any kind of failure */
                         bad = c;
-                        break;
                 }
         }
 
index 7f0898af6b21a4e59e6e566e72da27e16c7594a2..2ad7deab78314dd79dd47e317174b8a1a91ca87d 100644 (file)
@@ -930,12 +930,10 @@ static char *format_svc_param_value(DnsSvcParam *i) {
                 }
                 return strv_join(values_strv, ",");
         }
-        default: {
+        default:
                 value = decescape((char*) &i->value, i->length, " ,");
                 if (!value)
                         return NULL;
-                break;
-        }
         }
 
         char *qvalue;
@@ -1346,7 +1344,6 @@ const char* dns_resource_record_to_string(DnsResourceRecord *rr) {
                 }
                 if (r < 0)
                         return NULL;
-                break;
         }
 
         rr->to_string = s;
@@ -1671,7 +1668,6 @@ void dns_resource_record_hash_func(const DnsResourceRecord *rr, struct siphash *
         case DNS_TYPE_OPENPGPKEY:
         default:
                 siphash24_compress_safe(rr->generic.data, rr->generic.data_size, state);
-                break;
         }
 }
 
@@ -1909,7 +1905,6 @@ DnsResourceRecord *dns_resource_record_copy(DnsResourceRecord *rr) {
                 if (!copy->generic.data)
                         return NULL;
                 copy->generic.data_size = rr->generic.data_size;
-                break;
         }
 
         t = TAKE_PTR(copy);
index a1588114471d509a7efa60b522233d64595576fc..40e0d74e5b0f9711dc94ca7e065a9161466dc367 100644 (file)
@@ -1555,7 +1555,7 @@ DnsScope* manager_find_scope(Manager *m, DnsPacket *p) {
                 break;
 
         default:
-                break;
+                ;
         }
 
         return NULL;
index 61f9f8e6461f3e099714760ecd26f4b1987c4048..74a437e5d56f99ecb2f4b2cea250fc9fde893df9 100644 (file)
@@ -724,7 +724,6 @@ static void resolve_service_all_complete(DnsQuery *query) {
 
                         default:
                                 bad = aux;
-                                break;
                         }
                 }
                 if (!have_success) {
index be2a7f8d29a7fcc4ac1fc43aee76bea208863e95..6b216c046f610f18f36e64242c0909e3f38a9f3a 100644 (file)
@@ -368,7 +368,6 @@ static int run(int argc, char *argv[]) {
 
                 default:
                         log_debug("Unknown event %u from /dev/rfkill for index %u and type %s, ignoring.", event.op, event.idx, type);
-                        break;
                 }
         }
 
index f484a6fd1b29c41eb7cccab78bb206e8a6a429c3..f78741316134a39a3be0990299cc00da0d55bd23 100644 (file)
@@ -335,7 +335,6 @@ static int bus_append_exec_command(sd_bus_message *m, const char *field, const c
 
                 default:
                         done = true;
-                        break;
                 }
         } while (!done);
 
index 8e70e365dd69a4fd14b0b7ad531836a40321828b..d6541bd06ece987fa2e8474865efac3ee7468c44 100644 (file)
@@ -78,7 +78,6 @@ int sigrtmin18_handler(sd_event_source *s, const struct signalfd_siginfo *si, vo
         default:
                 log_notice("Received control signal %s with unknown command 0x%08x, ignoring.",
                            signal_to_string(si->ssi_signo), (unsigned) si->ssi_int);
-                break;
         }
 
         return 0;
index d9db618cf0f23e5dc182fc573096eb50152b8398..6cd320d8979387ba0304dcbd9da02140cf6ee49d 100644 (file)
@@ -1902,7 +1902,7 @@ int partition_pick_mount_options(
                 break;
 
         default:
-                break;
+                ;
         }
 
         /* So, when you request MS_RDONLY from ext4, then this means nothing. It happily still writes to the
index 85b369c36d627306fc5e2810fc813501c44584d2..9fea61ff8255588b234d928ad0d73465c4be0fe8 100644 (file)
@@ -137,7 +137,6 @@ int journal_access_check_and_warn(sd_journal *j, bool quiet, bool want_other_use
 
                 default:
                         log_warning_errno(err, "An error was encountered while opening journal file or directory %s, ignoring file: %m", path);
-                        break;
                 }
         }
 
index 4259d57c54bd2fe86cfa152d45a64b36f2ff2631..9cce9fa5120710c4e965bce0a572dcb53311a8d1 100644 (file)
@@ -541,7 +541,7 @@ static int fido2_use_hmac_hash_specific_token(
                         break;
 
                 default:
-                        break;
+                        ;
                 }
 
                 if (!retry_with_up && !retry_with_pin)
@@ -1027,7 +1027,7 @@ int fido2_generate_hmac_hash(
                         break;
 
                 default:
-                        break;
+                        ;
                 }
 
                 if (!retry_with_up && !retry_with_pin)
index 9853309bb291a32892eaf3a8aa710cfbaa393567..562defb4b1eec25ea5469b352c69ae4e79602767 100644 (file)
@@ -1598,7 +1598,6 @@ int seccomp_restrict_address_families(Set *address_families, bool allow_list) {
                         /* These we either know we don't support (i.e. are the ones that do use socketcall()), or we
                          * don't know */
                         supported = false;
-                        break;
                 }
 
                 if (!supported)
index 5c5bd15063994b502ccb8e28f929fd9c4ae8110f..7a45c6048d2c63881812abfe8450cfdc1e39fe8a 100644 (file)
@@ -153,7 +153,6 @@ void user_record_show(UserRecord *hr, bool show_full_group_info) {
                 }
 
                 printf("    Login OK: %syes%s\n", ansi_highlight_green(), ansi_normal());
-                break;
         }}
 
         r = user_record_test_password_change_required(hr);
index 8c1ebf9d0f71c673848be5064cfdd477cb849e6d..4ceba1c891fbd2a11cc2280b79e0c8f2b41aeca4 100644 (file)
@@ -34,7 +34,6 @@ static int list_dependencies_print(const char *name, UnitActiveState state, int
 
                 default:
                         on = ansi_highlight_red();
-                        break;
                 }
 
                 printf("%s%s%s ", on, special_glyph(unit_active_state_to_glyph(state)), ansi_normal());
index 932bf83076c7d97732f16859380cdf84744236e4..f81c3c18a1edec34efa1433e016c84145778a039 100644 (file)
@@ -850,7 +850,6 @@ int transfer_vacuum(
 
                 default:
                         assert_not_reached();
-                        break;
                 }
 
                 instance_free(oldest);
index a3a36e99f40dbfedc69486ad7e275d27dc0522f2..5cb73b63602719c20b74f6676b0c1b86c441e76d 100644 (file)
@@ -3919,7 +3919,7 @@ static int parse_line(
                 break;
 
         default:
-                break;
+                ;
         }
 
         if (from_cred) {
index c3388e640cb154be15dcc243dd9911b21339839a..84cd93c040a941c33c90e65c6d31823c19ac4823 100644 (file)
@@ -489,7 +489,6 @@ static int run(int argc, char *argv[]) {
                                 break;
                         default:
                                 printf("ID_TYPE=generic\n");
-                                break;
                         }
                 } else
                         printf("ID_TYPE=disk\n");
index 1366f9e0458e122948a3160360c2e9e280884cdc..24bb9cd5efb89ed041c6f351a27311bd6d810fd4 100644 (file)
@@ -482,7 +482,6 @@ static int cd_profiles(Context *c) {
                         break;
                 default:
                         log_debug("GET CONFIGURATION: feature 0x%04x <ignored>, with 0x%02x bytes", feature, features[i + 3]);
-                        break;
                 }
         }
 
index 368fab8827313e4383544585f08a2b1f3a664cb6..68fe8c36b58f782f04d0ab2091a0fa736a16dcc5 100644 (file)
@@ -71,7 +71,6 @@ int probe_smart_media(int mtd_fd, mtd_info_t* info) {
                 break;
         default:
                 spare_count = 24;
-                break;
         }
 
         for (offset = 0; offset < block_size * spare_count; offset += sector_size) {
index b63a46a730ae4e887e22529adc40e79582a02235..6ef93a6b9c212617967011ac570feb197da06511 100644 (file)
@@ -93,7 +93,6 @@ static void set_type(unsigned type_num, char *to, size_t len) {
                 break;
         default:
                 type = "generic";
-                break;
         }
         strscpy(to, len, type);
 }
@@ -368,7 +367,6 @@ static int per_dev_options(struct scsi_id_device *dev_scsi, int *good_bad, int *
                 default:
                         log_error("Unknown or bad option '%c' (0x%x)", option, (unsigned) option);
                         retval = -1;
-                        break;
                 }
         }
 
index 7148c80194a5865da6dcdfb407f18d5cbe608ca7..91d231c24e1450d578d7458adde1fb97aab51954 100644 (file)
@@ -66,8 +66,6 @@ static void set_usb_iftype(char *to, int if_class_num, size_t len) {
                 break;
         case 0xff: /* Vendor-specific */
                 break;
-        default:
-                break;
         }
         strncpy(to, type, len);
         to[len-1] = '\0';
@@ -77,7 +75,7 @@ static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len
         int type_num = 0;
         const char *type = "generic";
 
-        if (safe_atoi(from, &type_num) >= 0) {
+        if (safe_atoi(from, &type_num) >= 0)
                 switch (type_num) {
                 case 1: /* RBC devices */
                         type = "rbc";
@@ -94,10 +92,8 @@ static int set_usb_mass_storage_ifsubtype(char *to, const char *from, size_t len
                 case 6: /* Transparent SPC-2 devices */
                         type = "scsi";
                         break;
-                default:
-                        break;
                 }
-        }
+
         strscpy(to, len, type);
         return type_num;
 }
@@ -106,7 +102,7 @@ static void set_scsi_type(char *to, const char *from, size_t len) {
         unsigned type_num;
         const char *type = "generic";
 
-        if (safe_atou(from, &type_num) >= 0) {
+        if (safe_atou(from, &type_num) >= 0)
                 switch (type_num) {
                 case 0:
                 case 0xe:
@@ -123,10 +119,8 @@ static void set_scsi_type(char *to, const char *from, size_t len) {
                 case 5:
                         type = "cd";
                         break;
-                default:
-                        break;
                 }
-        }
+
         strscpy(to, len, type);
 }