From: Yu Watanabe Date: Wed, 5 Mar 2025 13:30:48 +0000 (+0900) Subject: tree-wide: drop unnecessary break in default branch X-Git-Tag: v258-rc1~1166 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5c9feb2d6ecb453e3fd9b0c527e5a94e2c56d14b;p=thirdparty%2Fsystemd.git tree-wide: drop unnecessary break in default branch --- diff --git a/src/analyze/analyze-chid.c b/src/analyze/analyze-chid.c index 0916e60c1fd..5e68da3ebf9 100644 --- a/src/analyze/analyze-chid.c +++ b/src/analyze/analyze-chid.c @@ -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); diff --git a/src/analyze/analyze-image-policy.c b/src/analyze/analyze-image-policy.c index 7d4f5498e84..df4f62f6b8d 100644 --- a/src/analyze/analyze-image-policy.c +++ b/src/analyze/analyze-image-policy.c @@ -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); diff --git a/src/basic/string-util.c b/src/basic/string-util.c index 4748d5e2b55..89c9dd4af19 100644 --- a/src/basic/string-util.c +++ b/src/basic/string-util.c @@ -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; } diff --git a/src/boot/boot.c b/src/boot/boot.c index 54561e4af4e..cf36c105f66 100644 --- a/src/boot/boot.c +++ b/src/boot/boot.c @@ -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. */ diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c index ce73599d902..62562910611 100644 --- a/src/cgtop/cgtop.c +++ b/src/cgtop/cgtop.c @@ -1066,7 +1066,6 @@ static int loop(const char *root) { fprintf(stdout, "\nUnknown key '%c'. Ignoring.", key); fflush(stdout); sleep(1); - break; } } } diff --git a/src/core/automount.c b/src/core/automount.c index 5ac5dec8d9d..b4611981f2c 100644 --- a/src/core/automount.c +++ b/src/core/automount.c @@ -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; diff --git a/src/core/execute-serialize.c b/src/core/execute-serialize.c index 0eec9cdf8fd..220b4be5caf 100644 --- a/src/core/execute-serialize.c +++ b/src/core/execute-serialize.c @@ -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); diff --git a/src/core/main.c b/src/core/main.c index e5b18b164cb..8a6a1338ae2 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -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()) diff --git a/src/core/mount.c b/src/core/mount.c index 361d8e03189..664f214f20a 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -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; } } diff --git a/src/core/smack-setup.c b/src/core/smack-setup.c index 7ea902b6f9c..150867b9580 100644 --- a/src/core/smack-setup.c +++ b/src/core/smack-setup.c @@ -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(); diff --git a/src/core/swap.c b/src/core/swap.c index 28afba37901..16072e5a713 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -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; } } diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c index a61bd01c164..21fb48a9ac7 100644 --- a/src/coredump/coredump.c +++ b/src/coredump/coredump.c @@ -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); diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c index 2a65a3e6b8d..9aa6c06748f 100644 --- a/src/detect-virt/detect-virt.c +++ b/src/detect-virt/detect-virt.c @@ -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) diff --git a/src/dissect/dissect.c b/src/dissect/dissect.c index 3fa3ecb8721..f707d7df256 100644 --- a/src/dissect/dissect.c +++ b/src/dissect/dissect.c @@ -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) { diff --git a/src/fundamental/macro-fundamental.h b/src/fundamental/macro-fundamental.h index d56dcb6eb6d..bc7bd2f4924 100644 --- a/src/fundamental/macro-fundamental.h +++ b/src/fundamental/macro-fundamental.h @@ -401,7 +401,7 @@ _found = true; \ break; \ default: \ - break; \ + ; \ } \ _found; \ }) diff --git a/src/home/homework.c b/src/home/homework.c index 7eb42e1dac6..51adce5f3cd 100644 --- a/src/home/homework.c +++ b/src/home/homework.c @@ -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); diff --git a/src/home/pam_systemd_home.c b/src/home/pam_systemd_home.c index dcb85adc61d..e3a687ca640 100644 --- a/src/home/pam_systemd_home.c +++ b/src/home/pam_systemd_home.c @@ -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; diff --git a/src/home/user-record-util.c b/src/home/user-record-util.c index 907dd435126..344ff73e7dd 100644 --- a/src/home/user-record-util.c +++ b/src/home/user-record-util.c @@ -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); diff --git a/src/import/import-generator.c b/src/import/import-generator.c index 3e052e54ec1..ad81b723559 100644 --- a/src/import/import-generator.c +++ b/src/import/import-generator.c @@ -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); diff --git a/src/import/importd.c b/src/import/importd.c index 34222c133e1..ad1cc93b769 100644 --- a/src/import/importd.c +++ b/src/import/importd.c @@ -524,7 +524,7 @@ static int transfer_start(Transfer *t) { break; default: - break; + ; } if (t->verify != _IMPORT_VERIFY_INVALID) { diff --git a/src/libsystemd-network/dhcp-option.c b/src/libsystemd-network/dhcp-option.c index e4ba77ae296..4945acfd563 100644 --- a/src/libsystemd-network/dhcp-option.c +++ b/src/libsystemd-network/dhcp-option.c @@ -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; diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c index 5d733baa571..566da47638e 100644 --- a/src/libsystemd-network/sd-dhcp-client.c +++ b/src/libsystemd-network/sd-dhcp-client.c @@ -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; diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c index fc891a0b045..5aac8143cba 100644 --- a/src/libsystemd-network/sd-dhcp-lease.c +++ b/src/libsystemd-network/sd-dhcp-lease.c @@ -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; diff --git a/src/libsystemd-network/sd-dns-resolver.c b/src/libsystemd-network/sd-dns-resolver.c index 5b4ed6e23aa..b24152f17e7 100644 --- a/src/libsystemd-network/sd-dns-resolver.c +++ b/src/libsystemd-network/sd-dns-resolver.c @@ -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; } diff --git a/src/libsystemd-network/test-dhcp-client.c b/src/libsystemd-network/test-dhcp-client.c index a5732a6da48..37ac827bd66 100644 --- a/src/libsystemd-network/test-dhcp-client.c +++ b/src/libsystemd-network/test-dhcp-client.c @@ -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; diff --git a/src/libsystemd-network/test-ipv4ll.c b/src/libsystemd-network/test-ipv4ll.c index e7dbd7f36fe..0dbc0873ba6 100644 --- a/src/libsystemd-network/test-ipv4ll.c +++ b/src/libsystemd-network/test-ipv4ll.c @@ -37,7 +37,6 @@ static void basic_request_handler(sd_ipv4ll *ll, int event, void *userdata) { break; default: assert_se(0); - break; } } diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 808d52f876d..04981eac42f 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -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); diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c index f23774504a0..c10c8a46d4a 100644 --- a/src/libsystemd/sd-bus/bus-objects.c +++ b/src/libsystemd/sd-bus/bus-objects.c @@ -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; diff --git a/src/libsystemd/sd-journal/journal-file.c b/src/libsystemd/sd-journal/journal-file.c index 40b44100603..fede9d438e8 100644 --- a/src/libsystemd/sd-journal/journal-file.c +++ b/src/libsystemd/sd-journal/journal-file.c @@ -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); diff --git a/src/libsystemd/sd-json/sd-json.c b/src/libsystemd/sd-json/sd-json.c index 99d941e1efd..4f641fbd71b 100644 --- a/src/libsystemd/sd-json/sd-json.c +++ b/src/libsystemd/sd-json/sd-json.c @@ -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) diff --git a/src/login/logind-button.c b/src/login/logind-button.c index bc49305fcd5..bb290fed71a 100644 --- a/src/login/logind-button.c +++ b/src/login/logind-button.c @@ -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) { diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index f0730f751c3..1a22a77e8ea 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -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; diff --git a/src/login/pam_systemd.c b/src/login/pam_systemd.c index 9406491c4a8..a50d1228c2a 100644 --- a/src/login/pam_systemd.c +++ b/src/login/pam_systemd.c @@ -1074,7 +1074,7 @@ static void session_context_mangle( break; default: - break; + ; } pam_debug_syslog(handle, debug, "Automatically chose session class '%s'.", c->class); diff --git a/src/network/netdev/l2tp-tunnel.c b/src/network/netdev/l2tp-tunnel.c index c87e44797ba..a14bbd272e8 100644 --- a/src/network/netdev/l2tp-tunnel.c +++ b/src/network/netdev/l2tp-tunnel.c @@ -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); diff --git a/src/network/netdev/tunnel.c b/src/network/netdev/tunnel.c index af05cfda81a..e6f857c90c9 100644 --- a/src/network/netdev/tunnel.c +++ b/src/network/netdev/tunnel.c @@ -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); diff --git a/src/network/networkd-address.c b/src/network/networkd-address.c index d35d2ed521e..e02a16b739b 100644 --- a/src/network/networkd-address.c +++ b/src/network/networkd-address.c @@ -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(); } } diff --git a/src/network/networkd-bridge-mdb.c b/src/network/networkd-bridge-mdb.c index 80ef3c14585..ba027bfa7c0 100644 --- a/src/network/networkd-bridge-mdb.c +++ b/src/network/networkd-bridge-mdb.c @@ -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: diff --git a/src/network/networkd-dhcp4.c b/src/network/networkd-dhcp4.c index 926e769258b..706eba6d276 100644 --- a/src/network/networkd-dhcp4.c +++ b/src/network/networkd-dhcp4.c @@ -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; diff --git a/src/network/networkd-ipv4ll.c b/src/network/networkd-ipv4ll.c index 046e4ca9571..ef8b0876b57 100644 --- a/src/network/networkd-ipv4ll.c +++ b/src/network/networkd-ipv4ll.c @@ -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; } } diff --git a/src/network/networkd-route.c b/src/network/networkd-route.c index cdc1f307af0..c37011079cb 100644 --- a/src/network/networkd-route.c +++ b/src/network/networkd-route.c @@ -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(); } } diff --git a/src/network/networkd-setlink.c b/src/network/networkd-setlink.c index 2f4a6c6e035..17c2b4b10eb 100644 --- a/src/network/networkd-setlink.c +++ b/src/network/networkd-setlink.c @@ -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; diff --git a/src/pcrlock/pcrlock.c b/src/pcrlock/pcrlock.c index 002ca43edbe..0b7697ad69e 100644 --- a/src/pcrlock/pcrlock.c +++ b/src/pcrlock/pcrlock.c @@ -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); diff --git a/src/resolve/resolved-bus.c b/src/resolve/resolved-bus.c index 61975de1d2e..1f06a7d57d1 100644 --- a/src/resolve/resolved-bus.c +++ b/src/resolve/resolved-bus.c @@ -1027,7 +1027,6 @@ static void resolve_service_all_complete(DnsQuery *query) { default: bad = aux; - break; } } diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c index 054ce5c3d16..049262e6da2 100644 --- a/src/resolve/resolved-dns-packet.c +++ b/src/resolve/resolved-dns-packet.c @@ -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; diff --git a/src/resolve/resolved-dns-query.c b/src/resolve/resolved-dns-query.c index 45223283196..4867ff0426e 100644 --- a/src/resolve/resolved-dns-query.c +++ b/src/resolve/resolved-dns-query.c @@ -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; } } diff --git a/src/resolve/resolved-dns-rr.c b/src/resolve/resolved-dns-rr.c index 7f0898af6b2..2ad7deab783 100644 --- a/src/resolve/resolved-dns-rr.c +++ b/src/resolve/resolved-dns-rr.c @@ -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); diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c index a1588114471..40e0d74e5b0 100644 --- a/src/resolve/resolved-manager.c +++ b/src/resolve/resolved-manager.c @@ -1555,7 +1555,7 @@ DnsScope* manager_find_scope(Manager *m, DnsPacket *p) { break; default: - break; + ; } return NULL; diff --git a/src/resolve/resolved-varlink.c b/src/resolve/resolved-varlink.c index 61f9f8e6461..74a437e5d56 100644 --- a/src/resolve/resolved-varlink.c +++ b/src/resolve/resolved-varlink.c @@ -724,7 +724,6 @@ static void resolve_service_all_complete(DnsQuery *query) { default: bad = aux; - break; } } if (!have_success) { diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index be2a7f8d29a..6b216c046f6 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -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; } } diff --git a/src/shared/bus-unit-util.c b/src/shared/bus-unit-util.c index f484a6fd1b2..f7874131613 100644 --- a/src/shared/bus-unit-util.c +++ b/src/shared/bus-unit-util.c @@ -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); diff --git a/src/shared/common-signal.c b/src/shared/common-signal.c index 8e70e365dd6..d6541bd06ec 100644 --- a/src/shared/common-signal.c +++ b/src/shared/common-signal.c @@ -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; diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c index d9db618cf0f..6cd320d8979 100644 --- a/src/shared/dissect-image.c +++ b/src/shared/dissect-image.c @@ -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 diff --git a/src/shared/journal-util.c b/src/shared/journal-util.c index 85b369c36d6..9fea61ff825 100644 --- a/src/shared/journal-util.c +++ b/src/shared/journal-util.c @@ -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; } } diff --git a/src/shared/libfido2-util.c b/src/shared/libfido2-util.c index 4259d57c54b..9cce9fa5120 100644 --- a/src/shared/libfido2-util.c +++ b/src/shared/libfido2-util.c @@ -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) diff --git a/src/shared/seccomp-util.c b/src/shared/seccomp-util.c index 9853309bb29..562defb4b1e 100644 --- a/src/shared/seccomp-util.c +++ b/src/shared/seccomp-util.c @@ -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) diff --git a/src/shared/user-record-show.c b/src/shared/user-record-show.c index 5c5bd150639..7a45c6048d2 100644 --- a/src/shared/user-record-show.c +++ b/src/shared/user-record-show.c @@ -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); diff --git a/src/systemctl/systemctl-list-dependencies.c b/src/systemctl/systemctl-list-dependencies.c index 8c1ebf9d0f7..4ceba1c891f 100644 --- a/src/systemctl/systemctl-list-dependencies.c +++ b/src/systemctl/systemctl-list-dependencies.c @@ -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()); diff --git a/src/sysupdate/sysupdate-transfer.c b/src/sysupdate/sysupdate-transfer.c index 932bf83076c..f81c3c18a1e 100644 --- a/src/sysupdate/sysupdate-transfer.c +++ b/src/sysupdate/sysupdate-transfer.c @@ -850,7 +850,6 @@ int transfer_vacuum( default: assert_not_reached(); - break; } instance_free(oldest); diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index a3a36e99f40..5cb73b63602 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -3919,7 +3919,7 @@ static int parse_line( break; default: - break; + ; } if (from_cred) { diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index c3388e640cb..84cd93c040a 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -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"); diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 1366f9e0458..24bb9cd5efb 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -482,7 +482,6 @@ static int cd_profiles(Context *c) { break; default: log_debug("GET CONFIGURATION: feature 0x%04x , with 0x%02x bytes", feature, features[i + 3]); - break; } } diff --git a/src/udev/mtd_probe/probe_smartmedia.c b/src/udev/mtd_probe/probe_smartmedia.c index 368fab88273..68fe8c36b58 100644 --- a/src/udev/mtd_probe/probe_smartmedia.c +++ b/src/udev/mtd_probe/probe_smartmedia.c @@ -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) { diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index b63a46a730a..6ef93a6b9c2 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -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; } } diff --git a/src/udev/udev-builtin-usb_id.c b/src/udev/udev-builtin-usb_id.c index 7148c80194a..91d231c24e1 100644 --- a/src/udev/udev-builtin-usb_id.c +++ b/src/udev/udev-builtin-usb_id.c @@ -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); }