chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 35c054baf62f7e397a9ff4e9c48176778148c2fd..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;
int r;
- assert(s);
+ assert_return(s, -EINVAL);
+ assert(l);
if (bus_type_is_basic(*s) || *s == SD_BUS_TYPE_VARIANT) {
*l = 1;
if (bus_type_is_basic(*s) || *s == SD_BUS_TYPE_VARIANT) {
*l = 1;
@@
-114,7
+115,7
@@
bool signature_is_single(const char *s, bool allow_dict_entry) {
int r;
size_t t;
int r;
size_t t;
- assert
(s
);
+ assert
_return(s, false
);
r = signature_element_length_internal(s, allow_dict_entry, 0, 0, &t);
if (r < 0)
r = signature_element_length_internal(s, allow_dict_entry, 0, 0, &t);
if (r < 0)
@@
-124,7
+125,8
@@
bool signature_is_single(const char *s, bool allow_dict_entry) {
}
bool signature_is_pair(const char *s) {
}
bool signature_is_pair(const char *s) {
- assert(s);
+
+ assert_return(s, false);
if (!bus_type_is_basic(*s))
return false;
if (!bus_type_is_basic(*s))
return false;
@@
-136,7
+138,7
@@
bool signature_is_valid(const char *s, bool allow_dict_entry) {
const char *p;
int r;
const char *p;
int r;
- assert
(s
);
+ assert
_return(s, false
);
p = s;
while (*p) {
p = s;
while (*p) {