chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sd-bus: also allow setting descriptions on bus slots
[elogind.git]
/
src
/
libsystemd
/
sd-bus
/
bus-match.c
diff --git
a/src/libsystemd/sd-bus/bus-match.c
b/src/libsystemd/sd-bus/bus-match.c
index 88b61a75be5845227b24f01a7df51796e5258949..5658c61ba789fba1529c99112bb4be8159f90b69 100644
(file)
--- a/
src/libsystemd/sd-bus/bus-match.c
+++ b/
src/libsystemd/sd-bus/bus-match.c
@@
-450,13
+450,13
@@
static int bus_match_add_compare_value(
where->child = c;
if (t == BUS_MATCH_MESSAGE_TYPE) {
where->child = c;
if (t == BUS_MATCH_MESSAGE_TYPE) {
- c->compare.children = hashmap_new(
trivial_hash_func, trivial_compare_func
);
+ c->compare.children = hashmap_new(
NULL
);
if (!c->compare.children) {
r = -ENOMEM;
goto fail;
}
} else if (BUS_MATCH_CAN_HASH(t)) {
if (!c->compare.children) {
r = -ENOMEM;
goto fail;
}
} else if (BUS_MATCH_CAN_HASH(t)) {
- c->compare.children = hashmap_new(
string_hash_func, string_compare_func
);
+ c->compare.children = hashmap_new(
&string_hash_ops
);
if (!c->compare.children) {
r = -ENOMEM;
goto fail;
if (!c->compare.children) {
r = -ENOMEM;
goto fail;
@@
-537,7
+537,7
@@
static int bus_match_find_compare_value(
else if (BUS_MATCH_CAN_HASH(t))
n = hashmap_get(c->compare.children, value_str);
else {
else if (BUS_MATCH_CAN_HASH(t))
n = hashmap_get(c->compare.children, value_str);
else {
- for (n = c->child; !value_node_same(n, t, value_u8, value_str); n = n->next)
+ for (n = c->child;
n &&
!value_node_same(n, t, value_u8, value_str); n = n->next)
;
}
;
}