diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-12-10 19:31:10 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-12-10 19:31:10 +0000 |
| commit | 35460afc4896b22b0df743b70003e8768d78111a (patch) | |
| tree | 8491925a6646e175bb0215676bd05cb169e04cbe /src/libsystemd-bus/bus-signature.c | |
| parent | ecad10fe4a4c247da72cafbc7b37f843c7c30c06 (diff) | |
Revert "libsystemd-bus: use assert_return"
This reverts commit f7e2bd5a8070ba86cba6bcbf7d1c9a8173d846d4.
Most of these checks are not programming errors, but happen during
normal runtime. For example bus_kernel_pop_memfd() is called all the
time on non-kdbus systems and is supposed to quickly fail if kdbus is
not available. However, assert_return() makes this failure
expensive, and hence has no place here. With the most recent change to
assert_return() it will even log a debug message, which should never
happen here.
Diffstat (limited to 'src/libsystemd-bus/bus-signature.c')
| -rw-r--r-- | src/libsystemd-bus/bus-signature.c | 13 |
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) { |