diff options
Diffstat (limited to 'src/libsystemd')
-rw-r--r-- | src/libsystemd/sd-bus/bus-dump.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/bus-gvariant.c | 10 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/bus-match.c | 6 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/bus-message.c | 8 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/bus-slot.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/sd-bus.c | 8 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/test-bus-benchmark.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-bus/test-bus-signature.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-event/sd-event.c | 12 | ||||
-rw-r--r-- | src/libsystemd/sd-event/test-event.c | 8 | ||||
-rw-r--r-- | src/libsystemd/sd-journal/sd-journal.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-journal/test-compress-benchmark.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-netlink/netlink-message.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-netlink/netlink-slot.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-netlink/rtnl-message.c | 2 | ||||
-rw-r--r-- | src/libsystemd/sd-resolve/sd-resolve.c | 4 | ||||
-rw-r--r-- | src/libsystemd/sd-resolve/test-resolve.c | 2 |
18 files changed, 39 insertions, 39 deletions
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c index 65b188e88e9..d50cd1eedd1 100644 --- a/src/libsystemd/sd-bus/bus-dump.c +++ b/src/libsystemd/sd-bus/bus-dump.c @@ -259,7 +259,7 @@ _public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) { break; default: - assert_not_reached("Unknown basic type."); + assert_not_reached(); } } diff --git a/src/libsystemd/sd-bus/bus-gvariant.c b/src/libsystemd/sd-bus/bus-gvariant.c index 850540a7852..07decfd1f3d 100644 --- a/src/libsystemd/sd-bus/bus-gvariant.c +++ b/src/libsystemd/sd-bus/bus-gvariant.c @@ -87,7 +87,7 @@ int bus_gvariant_get_size(const char *signature) { return -EINVAL; default: - assert_not_reached("Unknown signature type"); + assert_not_reached(); } p += n; @@ -164,7 +164,7 @@ int bus_gvariant_get_alignment(const char *signature) { } default: - assert_not_reached("Unknown signature type"); + assert_not_reached(); } if (a < 0) @@ -229,7 +229,7 @@ int bus_gvariant_is_fixed_size(const char *signature) { } default: - assert_not_reached("Unknown signature type"); + assert_not_reached(); } p += n; @@ -270,7 +270,7 @@ size_t bus_gvariant_read_word_le(void *p, size_t sz) { else if (sz == 8) return le64toh(x.u64); - assert_not_reached("unknown word width"); + assert_not_reached(); } void bus_gvariant_write_word_le(void *p, size_t sz, size_t value) { @@ -293,7 +293,7 @@ void bus_gvariant_write_word_le(void *p, size_t sz, size_t value) { else if (sz == 8) x.u64 = htole64((uint64_t) value); else - assert_not_reached("unknown word width"); + assert_not_reached(); memcpy(p, &x, sz); } diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c index 648f1ca62fe..ff8cf4ee0e4 100644 --- a/src/libsystemd/sd-bus/bus-match.c +++ b/src/libsystemd/sd-bus/bus-match.c @@ -199,7 +199,7 @@ static bool value_node_test( return false; default: - assert_not_reached("Invalid node type"); + assert_not_reached(); } } @@ -234,7 +234,7 @@ static bool value_node_same( return streq(node->value.str, value_str); default: - assert_not_reached("Invalid node type"); + assert_not_reached(); } } @@ -375,7 +375,7 @@ int bus_match_run( break; default: - assert_not_reached("Unknown match type."); + assert_not_reached(); } if (BUS_MATCH_CAN_HASH(node->type)) { diff --git a/src/libsystemd/sd-bus/bus-message.c b/src/libsystemd/sd-bus/bus-message.c index 20f7396c74e..954b159bf2e 100644 --- a/src/libsystemd/sd-bus/bus-message.c +++ b/src/libsystemd/sd-bus/bus-message.c @@ -2275,7 +2275,7 @@ _public_ int sd_bus_message_close_container(sd_bus_message *m) { else if (IN_SET(c->enclosing, SD_BUS_TYPE_STRUCT, SD_BUS_TYPE_DICT_ENTRY)) r = bus_message_close_struct(m, c, true); else - assert_not_reached("Unknown container type"); + assert_not_reached(); free(c->signature); free(c->offsets); @@ -3247,7 +3247,7 @@ static int container_next_item(sd_bus_message *m, struct bus_container *c, size_ } else if (c->enclosing == SD_BUS_TYPE_VARIANT) goto end; else - assert_not_reached("Unknown container type"); + assert_not_reached(); return 0; @@ -3460,7 +3460,7 @@ _public_ int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) { } default: - assert_not_reached("unexpected type"); + assert_not_reached(); } } @@ -3575,7 +3575,7 @@ _public_ int sd_bus_message_read_basic(sd_bus_message *m, char type, void *p) { } default: - assert_not_reached("Unknown basic type..."); + assert_not_reached(); } } } diff --git a/src/libsystemd/sd-bus/bus-slot.c b/src/libsystemd/sd-bus/bus-slot.c index a0009a7a87d..9f289575ef2 100644 --- a/src/libsystemd/sd-bus/bus-slot.c +++ b/src/libsystemd/sd-bus/bus-slot.c @@ -161,7 +161,7 @@ void bus_slot_disconnect(sd_bus_slot *slot, bool unref) { break; default: - assert_not_reached("Wut? Unknown slot type?"); + assert_not_reached(); } bus = slot->bus; diff --git a/src/libsystemd/sd-bus/sd-bus.c b/src/libsystemd/sd-bus/sd-bus.c index 6960161c365..0e5c8cf477d 100644 --- a/src/libsystemd/sd-bus/sd-bus.c +++ b/src/libsystemd/sd-bus/sd-bus.c @@ -2545,7 +2545,7 @@ _public_ int sd_bus_get_events(sd_bus *bus) { break; default: - assert_not_reached("Unknown state"); + assert_not_reached(); } return flags; @@ -2604,7 +2604,7 @@ _public_ int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec) { return 0; default: - assert_not_reached("Unknown or unexpected stat"); + assert_not_reached(); } } @@ -3063,7 +3063,7 @@ static int bus_exit_now(sd_bus *bus) { else exit(EXIT_FAILURE); - assert_not_reached("exit() didn't exit?"); + assert_not_reached(); } static int process_closing_reply_callback(sd_bus *bus, struct reply_callback *c) { @@ -3234,7 +3234,7 @@ static int bus_process_internal(sd_bus *bus, sd_bus_message **ret) { return process_closing(bus, ret); default: - assert_not_reached("Unknown state"); + assert_not_reached(); } if (ERRNO_IS_DISCONNECT(r)) { diff --git a/src/libsystemd/sd-bus/test-bus-benchmark.c b/src/libsystemd/sd-bus/test-bus-benchmark.c index 13c08fe2955..317653bedc2 100644 --- a/src/libsystemd/sd-bus/test-bus-benchmark.c +++ b/src/libsystemd/sd-bus/test-bus-benchmark.c @@ -57,7 +57,7 @@ static void server(sd_bus *b, size_t *result) { return; } else if (!sd_bus_message_is_signal(m, NULL, NULL)) - assert_not_reached("Unknown method"); + assert_not_reached(); } } diff --git a/src/libsystemd/sd-bus/test-bus-signature.c b/src/libsystemd/sd-bus/test-bus-signature.c index ea7efe68e49..ba94804869c 100644 --- a/src/libsystemd/sd-bus/test-bus-signature.c +++ b/src/libsystemd/sd-bus/test-bus-signature.c @@ -121,7 +121,7 @@ int main(int argc, char *argv[]) { OBJECT_PATH_FOREACH_PREFIX(prefix, "/") { log_info("<%s>", prefix); - assert_not_reached("???"); + assert_not_reached(); } r = 0; diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 388128bf330..02049db667a 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -639,7 +639,7 @@ int device_read_uevent_file(sd_device *device) { break; default: - assert_not_reached("Invalid state when parsing uevent file"); + assert_not_reached(); } if (major) { diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index e9199deb418..cb8f54b1d52 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -915,7 +915,7 @@ static void source_disconnect(sd_event_source *s) { } default: - assert_not_reached("Wut? I shouldn't exist."); + assert_not_reached(); } if (s->pending) @@ -2407,7 +2407,7 @@ static int event_source_offline( break; default: - assert_not_reached("Wut? I shouldn't exist."); + assert_not_reached(); } /* Always reshuffle time prioq, as the ratelimited flag may be changed. */ @@ -2495,7 +2495,7 @@ static int event_source_online( break; default: - assert_not_reached("Wut? I shouldn't exist."); + assert_not_reached(); } s->enabled = enabled; @@ -3569,7 +3569,7 @@ static int source_dispatch(sd_event_source *s) { case SOURCE_WATCHDOG: case _SOURCE_EVENT_SOURCE_TYPE_MAX: case _SOURCE_EVENT_SOURCE_TYPE_INVALID: - assert_not_reached("Wut? I shouldn't exist."); + assert_not_reached(); } s->dispatching = false; @@ -3929,7 +3929,7 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t break; default: - assert_not_reached("Unexpected event source type"); + assert_not_reached(); } break; @@ -3953,7 +3953,7 @@ static int process_epoll(sd_event *e, usec_t timeout, int64_t threshold, int64_t break; default: - assert_not_reached("Invalid wake-up pointer"); + assert_not_reached(); } } if (r < 0) diff --git a/src/libsystemd/sd-event/test-event.c b/src/libsystemd/sd-event/test-event.c index 9b92dac650d..e28885b5e06 100644 --- a/src/libsystemd/sd-event/test-event.c +++ b/src/libsystemd/sd-event/test-event.c @@ -55,7 +55,7 @@ static int io_handler(sd_event_source *s, int fd, uint32_t revents, void *userda else assert_se(sd_event_source_set_enabled(s, SD_EVENT_OFF) >= 0); } else - assert_not_reached("Yuck!"); + assert_not_reached(); return 1; } @@ -170,7 +170,7 @@ static int time_handler(sd_event_source *s, uint64_t usec, void *userdata) { got_c = true; } } else - assert_not_reached("Huh?"); + assert_not_reached(); return 2; } @@ -452,7 +452,7 @@ static int inotify_handler(sd_event_source *s, const struct inotify_event *ev, v log_info("inotify-handler <%s>: delete of %s", description, ev->name); assert_se(streq(ev->name, "sub")); } else - assert_not_reached("unexpected inotify event"); + assert_not_reached(); maybe_exit(s, c); return 1; @@ -470,7 +470,7 @@ static int delete_self_handler(sd_event_source *s, const struct inotify_event *e } else if (ev->mask & IN_IGNORED) { log_info("delete-self-handler: ignore"); } else - assert_not_reached("unexpected inotify event (delete-self)"); + assert_not_reached(); maybe_exit(s, c); return 1; diff --git a/src/libsystemd/sd-journal/sd-journal.c b/src/libsystemd/sd-journal/sd-journal.c index 5728c537bc6..e2be01d375f 100644 --- a/src/libsystemd/sd-journal/sd-journal.c +++ b/src/libsystemd/sd-journal/sd-journal.c @@ -190,7 +190,7 @@ static bool same_field(const void *_a, size_t s, const void *_b, size_t t) { return true; } - assert_not_reached("\"=\" not found"); + assert_not_reached(); } static Match *match_new(Match *p, MatchType t) { diff --git a/src/libsystemd/sd-journal/test-compress-benchmark.c b/src/libsystemd/sd-journal/test-compress-benchmark.c index eb3459e27ea..f222bf30212 100644 --- a/src/libsystemd/sd-journal/test-compress-benchmark.c +++ b/src/libsystemd/sd-journal/test-compress-benchmark.c @@ -68,7 +68,7 @@ static char* make_buf(size_t count, const char *type) { random_bytes(buf + 8*step, step); memzero(buf + 9*step, step); } else - assert_not_reached("here"); + assert_not_reached(); return buf; } diff --git a/src/libsystemd/sd-netlink/netlink-message.c b/src/libsystemd/sd-netlink/netlink-message.c index 473d74b01a1..c4dc4e67dd5 100644 --- a/src/libsystemd/sd-netlink/netlink-message.c +++ b/src/libsystemd/sd-netlink/netlink-message.c @@ -1163,7 +1163,7 @@ int sd_netlink_message_enter_container(sd_netlink_message *m, unsigned short typ break; } default: - assert_not_reached("sd-netlink: invalid type system union type"); + assert_not_reached(); } } else return -EINVAL; diff --git a/src/libsystemd/sd-netlink/netlink-slot.c b/src/libsystemd/sd-netlink/netlink-slot.c index b6de545fe26..76b4ccaa960 100644 --- a/src/libsystemd/sd-netlink/netlink-slot.c +++ b/src/libsystemd/sd-netlink/netlink-slot.c @@ -92,7 +92,7 @@ void netlink_slot_disconnect(sd_netlink_slot *slot, bool unref) { break; default: - assert_not_reached("Wut? Unknown slot type?"); + assert_not_reached(); } slot->type = _NETLINK_SLOT_INVALID; diff --git a/src/libsystemd/sd-netlink/rtnl-message.c b/src/libsystemd/sd-netlink/rtnl-message.c index e771b95e084..a5a2f4424ff 100644 --- a/src/libsystemd/sd-netlink/rtnl-message.c +++ b/src/libsystemd/sd-netlink/rtnl-message.c @@ -288,7 +288,7 @@ int sd_rtnl_message_new_nexthop(sd_netlink *rtnl, sd_netlink_message **ret, assert_return(IN_SET(nh_family, AF_UNSPEC, AF_INET, AF_INET6), -EINVAL); break; default: - assert_not_reached("Invalid message type."); + assert_not_reached(); } assert_return(ret, -EINVAL); diff --git a/src/libsystemd/sd-resolve/sd-resolve.c b/src/libsystemd/sd-resolve/sd-resolve.c index ee973c06922..c8af16a9181 100644 --- a/src/libsystemd/sd-resolve/sd-resolve.c +++ b/src/libsystemd/sd-resolve/sd-resolve.c @@ -397,7 +397,7 @@ static int handle_request(int out_fd, const Packet *packet, size_t length) { return -ECONNRESET; default: - assert_not_reached("Unknown request"); + assert_not_reached(); } return 0; @@ -661,7 +661,7 @@ static int complete_query(sd_resolve *resolve, sd_resolve_query *q) { break; default: - assert_not_reached("Cannot complete unknown query type"); + assert_not_reached(); } resolve->current = NULL; diff --git a/src/libsystemd/sd-resolve/test-resolve.c b/src/libsystemd/sd-resolve/test-resolve.c index b973dfd90d2..647bd1e381d 100644 --- a/src/libsystemd/sd-resolve/test-resolve.c +++ b/src/libsystemd/sd-resolve/test-resolve.c @@ -99,7 +99,7 @@ int main(int argc, char *argv[]) { } if (r < 0) { log_error_errno(r, "sd_resolve_wait(): %m"); - assert_not_reached("sd_resolve_wait() failed"); + assert_not_reached(); } } |