chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timedated: use libsystemd-bus instead of libdbus for bus communication
[elogind.git]
/
src
/
libsystemd-bus
/
bus-control.c
diff --git
a/src/libsystemd-bus/bus-control.c
b/src/libsystemd-bus/bus-control.c
index 66f713082c1eaf9a42b7970996f926d01a09ac02..836570d41e0b178b5ff0212070cd066b6a2ba3e4 100644
(file)
--- a/
src/libsystemd-bus/bus-control.c
+++ b/
src/libsystemd-bus/bus-control.c
@@
-33,6
+33,7
@@
#include "bus-message.h"
#include "bus-control.h"
#include "bus-bloom.h"
#include "bus-message.h"
#include "bus-control.h"
#include "bus-bloom.h"
+#include "bus-util.h"
int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
int r;
int sd_bus_get_unique_name(sd_bus *bus, const char **unique) {
int r;
@@
-75,7
+76,7
@@
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
l = strlen(name);
n = alloca0(offsetof(struct kdbus_cmd_name, name) + l + 1);
n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
l = strlen(name);
n = alloca0(offsetof(struct kdbus_cmd_name, name) + l + 1);
n->size = offsetof(struct kdbus_cmd_name, name) + l + 1;
- n->
name_
flags = flags;
+ n->flags = flags;
memcpy(n->name, name, l+1);
#ifdef HAVE_VALGRIND_MEMCHECK_H
memcpy(n->name, name, l+1);
#ifdef HAVE_VALGRIND_MEMCHECK_H
@@
-86,7
+87,7
@@
int sd_bus_request_name(sd_bus *bus, const char *name, int flags) {
if (r < 0)
return -errno;
if (r < 0)
return -errno;
- return n->
name_
flags;
+ return n->flags;
} else {
r = sd_bus_call_method(
bus,
} else {
r = sd_bus_call_method(
bus,
@@
-142,7
+143,7
@@
int sd_bus_release_name(sd_bus *bus, const char *name) {
if (r < 0)
return -errno;
if (r < 0)
return -errno;
- return n->
name_
flags;
+ return n->flags;
} else {
r = sd_bus_call_method(
bus,
} else {
r = sd_bus_call_method(
bus,
@@
-406,8
+407,10
@@
int bus_add_match_internal(
break;
case BUS_MATCH_PATH_NAMESPACE:
break;
case BUS_MATCH_PATH_NAMESPACE:
- bloom_add_pair(bloom, "path-slash-prefix", c->value_str);
- using_bloom = true;
+ if (!streq(c->value_str, "/")) {
+ bloom_add_pair(bloom, "path-slash-prefix", c->value_str);
+ using_bloom = true;
+ }
break;
case BUS_MATCH_ARG...BUS_MATCH_ARG_LAST: {
break;
case BUS_MATCH_ARG...BUS_MATCH_ARG_LAST: {