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
/
sd-bus.c
diff --git
a/src/libsystemd/sd-bus/sd-bus.c
b/src/libsystemd/sd-bus/sd-bus.c
index e677a88bac2919b6e93f029b6e7187a3b010c172..251720a6ba7f3efc87cca102fa8c26a633ece970 100644
(file)
--- a/
src/libsystemd/sd-bus/sd-bus.c
+++ b/
src/libsystemd/sd-bus/sd-bus.c
@@
-129,7
+129,7
@@
static void bus_free(sd_bus *b) {
free(b->machine);
free(b->fake_label);
free(b->cgroup_root);
free(b->machine);
free(b->fake_label);
free(b->cgroup_root);
- free(b->
connection_name
);
+ free(b->
description
);
free(b->exec_path);
strv_free(b->exec_argv);
free(b->exec_path);
strv_free(b->exec_argv);
@@
-139,7
+139,7
@@
static void bus_free(sd_bus *b) {
bus_reset_queues(b);
bus_reset_queues(b);
- hashmap_free_free(b->reply_callbacks);
+
ordered_
hashmap_free_free(b->reply_callbacks);
prioq_free(b->reply_callbacks_prioq);
assert(b->match_callbacks.type == BUS_MATCH_ROOT);
prioq_free(b->reply_callbacks_prioq);
assert(b->match_callbacks.type == BUS_MATCH_ROOT);
@@
-323,20
+323,20
@@
_public_ int sd_bus_set_trusted(sd_bus *bus, int b) {
return 0;
}
return 0;
}
-_public_ int sd_bus_set_
name(sd_bus *bus, const char *name
) {
+_public_ int sd_bus_set_
description(sd_bus *bus, const char *description
) {
char *n;
assert_return(bus, -EINVAL);
char *n;
assert_return(bus, -EINVAL);
- assert_return(
name
, -EINVAL);
+ assert_return(
description
, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(bus->state == BUS_UNSET, -EPERM);
assert_return(!bus_pid_changed(bus), -ECHILD);
- n = strdup(
name
);
+ n = strdup(
description
);
if (!n)
return -ENOMEM;
if (!n)
return -ENOMEM;
- free(bus->
connection_name
);
- bus->
connection_name
= n;
+ free(bus->
description
);
+ bus->
description
= n;
return 0;
}
return 0;
}
@@
-1157,17
+1157,13
@@
int bus_set_address_user(sd_bus *b) {
return -ENOMEM;
#ifdef ENABLE_KDBUS
return -ENOMEM;
#ifdef ENABLE_KDBUS
- asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, getuid(), ee);
+
(void)
asprintf(&b->address, KERNEL_USER_BUS_FMT ";" UNIX_USER_BUS_FMT, getuid(), ee);
#else
#else
- asprintf(&b->address, UNIX_USER_BUS_FMT, ee);
+
(void)
asprintf(&b->address, UNIX_USER_BUS_FMT, ee);
#endif
} else {
#ifdef ENABLE_KDBUS
#endif
} else {
#ifdef ENABLE_KDBUS
- int r;
-
- r = asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid());
- if (r < 0)
- return -ENOMEM;
+ (void) asprintf(&b->address, KERNEL_USER_BUS_FMT, getuid());
#else
return -ECONNREFUSED;
#endif
#else
return -ECONNREFUSED;
#endif
@@
-1759,7
+1755,7
@@
_public_ int sd_bus_call_async(
if (!BUS_IS_OPEN(bus->state))
return -ENOTCONN;
if (!BUS_IS_OPEN(bus->state))
return -ENOTCONN;
- r = hashmap_ensure_allocated(&bus->reply_callbacks, &uint64_hash_ops);
+ r =
ordered_
hashmap_ensure_allocated(&bus->reply_callbacks, &uint64_hash_ops);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1782,7
+1778,7
@@
_public_ int sd_bus_call_async(
s->reply_callback.callback = callback;
s->reply_callback.cookie = BUS_MESSAGE_COOKIE(m);
s->reply_callback.callback = callback;
s->reply_callback.cookie = BUS_MESSAGE_COOKIE(m);
- r = hashmap_put(bus->reply_callbacks, &s->reply_callback.cookie, &s->reply_callback);
+ r =
ordered_
hashmap_put(bus->reply_callbacks, &s->reply_callback.cookie, &s->reply_callback);
if (r < 0) {
s->reply_callback.cookie = 0;
return r;
if (r < 0) {
s->reply_callback.cookie = 0;
return r;
@@
-2096,7
+2092,7
@@
static int process_timeout(sd_bus *bus) {
assert_se(prioq_pop(bus->reply_callbacks_prioq) == c);
c->timeout = 0;
assert_se(prioq_pop(bus->reply_callbacks_prioq) == c);
c->timeout = 0;
- hashmap_remove(bus->reply_callbacks, &c->cookie);
+
ordered_
hashmap_remove(bus->reply_callbacks, &c->cookie);
c->cookie = 0;
slot = container_of(c, sd_bus_slot, reply_callback);
c->cookie = 0;
slot = container_of(c, sd_bus_slot, reply_callback);
@@
-2165,7
+2161,7
@@
static int process_reply(sd_bus *bus, sd_bus_message *m) {
if (m->destination && bus->unique_name && !streq_ptr(m->destination, bus->unique_name))
return 0;
if (m->destination && bus->unique_name && !streq_ptr(m->destination, bus->unique_name))
return 0;
- c = hashmap_remove(bus->reply_callbacks, &m->reply_cookie);
+ c =
ordered_
hashmap_remove(bus->reply_callbacks, &m->reply_cookie);
if (!c)
return 0;
if (!c)
return 0;
@@
-2499,7
+2495,7
@@
static int process_closing(sd_bus *bus, sd_bus_message **ret) {
assert(bus);
assert(bus->state == BUS_CLOSING);
assert(bus);
assert(bus->state == BUS_CLOSING);
- c = hashmap_first(bus->reply_callbacks);
+ c =
ordered_
hashmap_first(bus->reply_callbacks);
if (c) {
_cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
sd_bus_slot *slot;
if (c) {
_cleanup_bus_error_free_ sd_bus_error error_buffer = SD_BUS_ERROR_NULL;
sd_bus_slot *slot;
@@
-2522,7
+2518,7
@@
static int process_closing(sd_bus *bus, sd_bus_message **ret) {
c->timeout = 0;
}
c->timeout = 0;
}
- hashmap_remove(bus->reply_callbacks, &c->cookie);
+
ordered_
hashmap_remove(bus->reply_callbacks, &c->cookie);
c->cookie = 0;
slot = container_of(c, sd_bus_slot, reply_callback);
c->cookie = 0;
slot = container_of(c, sd_bus_slot, reply_callback);
@@
-3019,7
+3015,7
@@
static int attach_io_events(sd_bus *bus) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_event_source_set_
name
(bus->input_io_event_source, "bus-input");
+ r = sd_event_source_set_
description
(bus->input_io_event_source, "bus-input");
} else
r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd);
} else
r = sd_event_source_set_io_fd(bus->input_io_event_source, bus->input_fd);
@@
-3038,7
+3034,7
@@
static int attach_io_events(sd_bus *bus) {
if (r < 0)
return r;
if (r < 0)
return r;
- r = sd_event_source_set_
name
(bus->input_io_event_source, "bus-output");
+ r = sd_event_source_set_
description
(bus->input_io_event_source, "bus-output");
} else
r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd);
} else
r = sd_event_source_set_io_fd(bus->output_io_event_source, bus->output_fd);
@@
-3091,7
+3087,7
@@
_public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = sd_event_source_set_
name
(bus->time_event_source, "bus-time");
+ r = sd_event_source_set_
description
(bus->time_event_source, "bus-time");
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-3099,7
+3095,7
@@
_public_ int sd_bus_attach_event(sd_bus *bus, sd_event *event, int priority) {
if (r < 0)
goto fail;
if (r < 0)
goto fail;
- r = sd_event_source_set_
name
(bus->quit_event_source, "bus-exit");
+ r = sd_event_source_set_
description
(bus->quit_event_source, "bus-exit");
if (r < 0)
goto fail;
if (r < 0)
goto fail;
@@
-3326,12
+3322,12
@@
_public_ int sd_bus_try_close(sd_bus *bus) {
return 0;
}
return 0;
}
-_public_ int sd_bus_get_
name(sd_bus *bus, const char **name
) {
+_public_ int sd_bus_get_
description(sd_bus *bus, const char **description
) {
assert_return(bus, -EINVAL);
assert_return(bus, -EINVAL);
- assert_return(
name
, -EINVAL);
+ assert_return(
description
, -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
assert_return(!bus_pid_changed(bus), -ECHILD);
- *
name = bus->connection_name
;
+ *
description = bus->description
;
return 0;
}
return 0;
}