libsystemd-bus: use assert_return

[elogind.git] / src / libsystemd-bus / bus-signature.c

diff --git a/src/libsystemd-bus/bus-signature.c b/src/libsystemd-bus/bus-signature.c
index a92b7124c32b3b72a702d2a601e8e8b1c28e5614..3fb07943d7c9e09c8a369055c8bb86544cc8c1a3 100644 (file)
--- a/src/libsystemd-bus/bus-signature.c
+++ b/src/libsystemd-bus/bus-signature.c
@@ -33,7 +33,8 @@ static int signature_element_length_internal(
 
         int r;
 
-        assert(s);
+        assert_return(s, -EINVAL);
+        assert(l);
 
         if (bus_type_is_basic(*s) || *s == SD_BUS_TYPE_VARIANT) {
                 *l = 1;
@@ -110,13 +111,13 @@ int signature_element_length(const char *s, size_t *l) {
         return signature_element_length_internal(s, true, 0, 0, l);
 }
 
-bool signature_is_single(const char *s) {
+bool signature_is_single(const char *s, bool allow_dict_entry) {
         int r;
         size_t t;
 
-        assert(s);
+        assert_return(s, false);
 
-        r = signature_element_length(s, &t);
+        r = signature_element_length_internal(s, allow_dict_entry, 0, 0, &t);
         if (r < 0)
                 return false;
 
@@ -124,19 +125,20 @@ bool signature_is_single(const char *s) {
 }
 
 bool signature_is_pair(const char *s) {
-        assert(s);
+
+        assert_return(s, false);
 
         if (!bus_type_is_basic(*s))
                 return false;
 
-        return signature_is_single(s + 1);
+        return signature_is_single(s + 1, false);
 }
 
 bool signature_is_valid(const char *s, bool allow_dict_entry) {
         const char *p;
         int r;
 
-        assert(s);
+        assert_return(s, false);
 
         p = s;
         while (*p) {