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, 9 insertions, 4 deletions
diff --git a/src/libsystemd-bus/bus-signature.c b/src/libsystemd-bus/bus-signature.c
index 3fb07943d7..1e5bf4821d 100644
--- a/src/libsystemd-bus/bus-signature.c
+++ b/src/libsystemd-bus/bus-signature.c
@@ -33,7 +33,9 @@ static int signature_element_length_internal(
int r;
- assert_return(s, -EINVAL);
+ if (!s)
+ return -EINVAL;
+
assert(l);
if (bus_type_is_basic(*s) || *s == SD_BUS_TYPE_VARIANT) {
@@ -115,7 +117,8 @@ bool signature_is_single(const char *s, bool allow_dict_entry) {
int r;
size_t t;
- assert_return(s, false);
+ if (!s)
+ return false;
r = signature_element_length_internal(s, allow_dict_entry, 0, 0, &t);
if (r < 0)
@@ -126,7 +129,8 @@ bool signature_is_single(const char *s, bool allow_dict_entry) {
bool signature_is_pair(const char *s) {
- assert_return(s, false);
+ if (!s)
+ return false;
if (!bus_type_is_basic(*s))
return false;
@@ -138,7 +142,8 @@ bool signature_is_valid(const char *s, bool allow_dict_entry) {
const char *p;
int r;
- assert_return(s, false);
+ if (!s)
+ return false;
p = s;
while (*p) {