X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Flibsystemd-bus%2Fbus-signature.c;h=3fb07943d7c9e09c8a369055c8bb86544cc8c1a3;hp=1e5bf4821d9526da05478c92cfe2785acd611b08;hb=f7e2bd5a8070ba86cba6bcbf7d1c9a8173d846d4;hpb=d838db0d3b1369639ed7572f4f838eda58b8d858

diff --git a/src/libsystemd-bus/bus-signature.c b/src/libsystemd-bus/bus-signature.c
index 1e5bf4821..3fb07943d 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) {