summaryrefslogtreecommitdiff
path: root/src/libsystemd-bus/bus-signature.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libsystemd-bus/bus-signature.c')
-rw-r--r--src/libsystemd-bus/bus-signature.c13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/libsystemd-bus/bus-signature.c b/src/libsystemd-bus/bus-signature.c
index 1e5bf4821d..3fb07943d7 100644
--- a/src/libsystemd-bus/bus-signature.c
+++ b/src/libsystemd-bus/bus-signature.c
@@ -33,9 +33,7 @@ static int signature_element_length_internal(
int r;
- if (!s)
- return -EINVAL;
-
+ assert_return(s, -EINVAL);
assert(l);
if (bus_type_is_basic(*s) || *s == SD_BUS_TYPE_VARIANT) {
@@ -117,8 +115,7 @@ bool signature_is_single(const char *s, bool allow_dict_entry) {
int r;
size_t t;
- if (!s)
- return false;
+ assert_return(s, false);
r = signature_element_length_internal(s, allow_dict_entry, 0, 0, &t);
if (r < 0)
@@ -129,8 +126,7 @@ bool signature_is_single(const char *s, bool allow_dict_entry) {
bool signature_is_pair(const char *s) {
- if (!s)
- return false;
+ assert_return(s, false);
if (!bus_type_is_basic(*s))
return false;
@@ -142,8 +138,7 @@ bool signature_is_valid(const char *s, bool allow_dict_entry) {
const char *p;
int r;
- if (!s)
- return false;
+ assert_return(s, false);
p = s;
while (*p) {