summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/acl-util.c2
-rw-r--r--src/shared/bus-util.c4
-rw-r--r--src/shared/condition.c2
-rw-r--r--src/shared/format-table.c6
-rw-r--r--src/shared/install.c6
-rw-r--r--src/shared/journal-importer.c2
-rw-r--r--src/shared/json.c12
-rw-r--r--src/shared/local-addresses.c4
-rw-r--r--src/shared/logs-show.c2
-rw-r--r--src/shared/service-util.c2
-rw-r--r--src/shared/socket-netlink.c2
-rw-r--r--src/shared/tests.c2
-rw-r--r--src/shared/userdb.c4
-rw-r--r--src/shared/varlink.c4
-rw-r--r--src/shared/xml.c2
15 files changed, 28 insertions, 28 deletions
diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
index 10e1857649..3f286a888b 100644
--- a/src/shared/acl-util.c
+++ b/src/shared/acl-util.c
@@ -320,7 +320,7 @@ static int acl_entry_equal(acl_entry_t a, acl_entry_t b) {
return *gid_a == *gid_b;
}
default:
- assert_not_reached("Unknown acl tag type");
+ assert_not_reached();
}
}
diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 64ca67993c..942a59be88 100644
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -291,7 +291,7 @@ int bus_connect_transport(
break;
default:
- assert_not_reached("Hmm, unknown transport type.");
+ assert_not_reached();
}
if (r < 0)
return r;
@@ -337,7 +337,7 @@ int bus_connect_transport_systemd(BusTransport transport, const char *host, bool
break;
default:
- assert_not_reached("Hmm, unknown transport type.");
+ assert_not_reached();
}
return r;
diff --git a/src/shared/condition.c b/src/shared/condition.c
index ec9d57b292..1d28f7ba57 100644
--- a/src/shared/condition.c
+++ b/src/shared/condition.c
@@ -202,7 +202,7 @@ static bool test_order(int k, OrderOperator p) {
return k > 0;
default:
- assert_not_reached("unknown order");
+ assert_not_reached();
}
}
diff --git a/src/shared/format-table.c b/src/shared/format-table.c
index 6dca6661e1..c2bde30131 100644
--- a/src/shared/format-table.c
+++ b/src/shared/format-table.c
@@ -316,7 +316,7 @@ static size_t table_data_size(TableDataType type, const void *data) {
return sizeof(mode_t);
default:
- assert_not_reached("Uh? Unexpected cell type");
+ assert_not_reached();
}
}
@@ -1048,7 +1048,7 @@ int table_add_many_internal(Table *t, TableDataType first_type, ...) {
return 0;
default:
- assert_not_reached("Uh? Unexpected data type.");
+ assert_not_reached();
}
r = table_add_cell(t, &last_cell, type, data);
@@ -1778,7 +1778,7 @@ static const char *table_data_format(Table *t, TableData *d, bool avoid_uppercas
}
default:
- assert_not_reached("Unexpected type?");
+ assert_not_reached();
}
return d->formatted;
diff --git a/src/shared/install.c b/src/shared/install.c
index 4bf868f8e9..a348f0c572 100644
--- a/src/shared/install.c
+++ b/src/shared/install.c
@@ -2897,7 +2897,7 @@ int unit_file_lookup_state(
break;
default:
- assert_not_reached("Unexpected unit file type.");
+ assert_not_reached();
}
*ret = state;
@@ -2989,7 +2989,7 @@ static int presets_find_config(UnitFileScope scope, const char *root_dir, char *
else if (IN_SET(scope, UNIT_FILE_GLOBAL, UNIT_FILE_USER))
dirs = user_dirs;
else
- assert_not_reached("Invalid unit file scope");
+ assert_not_reached();
return conf_files_list_strv(files, ".preset", root_dir, 0, dirs);
}
@@ -3173,7 +3173,7 @@ static int query_presets(const char *name, const UnitFilePresets *presets, char
log_debug("Preset files say disable %s.", name);
return 0;
default:
- assert_not_reached("invalid preset action");
+ assert_not_reached();
}
}
diff --git a/src/shared/journal-importer.c b/src/shared/journal-importer.c
index 9e11dc09c1..bbb152481e 100644
--- a/src/shared/journal-importer.c
+++ b/src/shared/journal-importer.c
@@ -417,7 +417,7 @@ int journal_importer_process_data(JournalImporter *imp) {
return 0; /* continue */
default:
- assert_not_reached("wtf?");
+ assert_not_reached();
}
}
diff --git a/src/shared/json.c b/src/shared/json.c
index c52460a3ec..ea37728dc5 100644
--- a/src/shared/json.c
+++ b/src/shared/json.c
@@ -505,7 +505,7 @@ static void json_variant_set(JsonVariant *a, JsonVariant *b) {
break;
default:
- assert_not_reached("Unexpected variant type");
+ assert_not_reached();
}
}
@@ -763,7 +763,7 @@ static size_t json_variant_size(JsonVariant* v) {
return offsetof(JsonVariant, value);
default:
- assert_not_reached("unexpected type");
+ assert_not_reached();
}
}
@@ -1397,7 +1397,7 @@ bool json_variant_equal(JsonVariant *a, JsonVariant *b) {
}
default:
- assert_not_reached("Unknown variant type.");
+ assert_not_reached();
}
}
@@ -1749,7 +1749,7 @@ static int json_format(FILE *f, JsonVariant *v, JsonFormatFlags flags, const cha
}
default:
- assert_not_reached("Unexpected variant type.");
+ assert_not_reached();
}
return 0;
@@ -2787,7 +2787,7 @@ int json_tokenize(
return -EINVAL;
default:
- assert_not_reached("Unexpected tokenizer state");
+ assert_not_reached();
}
null_return:
@@ -3156,7 +3156,7 @@ static int json_parse_internal(
break;
default:
- assert_not_reached("Unexpected token");
+ assert_not_reached();
}
if (add) {
diff --git a/src/shared/local-addresses.c b/src/shared/local-addresses.c
index bd69e946f5..d1f6b5df03 100644
--- a/src/shared/local-addresses.c
+++ b/src/shared/local-addresses.c
@@ -422,7 +422,7 @@ int local_outbounds(
break;
default:
- assert_not_reached("Unexpected protocol");
+ assert_not_reached();
}
/* So ideally we'd just use IP_UNICAST_IF here to pass the ifindex info to the kernel before
@@ -493,7 +493,7 @@ int local_outbounds(
break;
default:
- assert_not_reached("Unexpected protocol");
+ assert_not_reached();
}
}
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 3165cf29da..afce8e8fe3 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -416,7 +416,7 @@ static int output_timestamp_realtime(FILE *f, sd_journal *j, OutputMode mode, Ou
break;
default:
- assert_not_reached("Unknown time format");
+ assert_not_reached();
}
}
diff --git a/src/shared/service-util.c b/src/shared/service-util.c
index 092be6ee7f..99b1108b77 100644
--- a/src/shared/service-util.c
+++ b/src/shared/service-util.c
@@ -76,7 +76,7 @@ int service_parse_argv(
return -EINVAL;
default:
- assert_not_reached("Unknown option code.");
+ assert_not_reached();
}
if (optind < argc)
diff --git a/src/shared/socket-netlink.c b/src/shared/socket-netlink.c
index 0c04437826..494047a5d1 100644
--- a/src/shared/socket-netlink.c
+++ b/src/shared/socket-netlink.c
@@ -129,7 +129,7 @@ int socket_address_parse(SocketAddress *a, const char *s) {
.size = sizeof(struct sockaddr_in6),
};
else
- assert_not_reached("Family quarrel");
+ assert_not_reached();
}
}
diff --git a/src/shared/tests.c b/src/shared/tests.c
index ab7d799029..175b6d5499 100644
--- a/src/shared/tests.c
+++ b/src/shared/tests.c
@@ -160,7 +160,7 @@ bool have_namespaces(void) {
if (si.si_status == EXIT_FAILURE)
return false;
- assert_not_reached("unexpected exit code");
+ assert_not_reached();
}
bool can_memlock(void) {
diff --git a/src/shared/userdb.c b/src/shared/userdb.c
index 91ac7c3832..555c71c82d 100644
--- a/src/shared/userdb.c
+++ b/src/shared/userdb.c
@@ -90,7 +90,7 @@ UserDBIterator* userdb_iterator_free(UserDBIterator *iterator) {
break;
default:
- assert_not_reached("Unexpected state?");
+ assert_not_reached();
}
sd_event_unref(iterator->event);
@@ -333,7 +333,7 @@ static int userdb_on_query_reply(
}
default:
- assert_not_reached("unexpected lookup");
+ assert_not_reached();
}
finish:
diff --git a/src/shared/varlink.c b/src/shared/varlink.c
index 4033947d3b..07a1b96f60 100644
--- a/src/shared/varlink.c
+++ b/src/shared/varlink.c
@@ -905,7 +905,7 @@ static int varlink_dispatch_method(Varlink *v) {
break;
default:
- assert_not_reached("Unexpected state");
+ assert_not_reached();
}
@@ -1521,7 +1521,7 @@ int varlink_call(
return varlink_log_errno(v, SYNTHETIC_ERRNO(ETIME), "Connection timed out.");
default:
- assert_not_reached("Unexpected state after method call.");
+ assert_not_reached();
}
}
diff --git a/src/shared/xml.c b/src/shared/xml.c
index 8ff3feafe4..df381d85b8 100644
--- a/src/shared/xml.c
+++ b/src/shared/xml.c
@@ -233,5 +233,5 @@ int xml_tokenize(const char **p, char **name, void **state, unsigned *line) {
}
- assert_not_reached("Bad state");
+ assert_not_reached();
}
View Lorry Controller Status