summaryrefslogtreecommitdiff
path: root/src/libelogind/sd-bus/sd-bus.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/libelogind/sd-bus/sd-bus.c')
-rw-r--r--src/libelogind/sd-bus/sd-bus.c30
1 files changed, 2 insertions, 28 deletions
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index 107fc363c..38730da9e 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -233,7 +233,6 @@ _public_ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd) {
return 0;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]) {
char *p, **a;
@@ -261,7 +260,6 @@ _public_ int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[])
return 0;
}
-#endif // 0
_public_ int sd_bus_set_bus_client(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
@@ -272,7 +270,6 @@ _public_ int sd_bus_set_bus_client(sd_bus *bus, int b) {
return 0;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_set_monitor(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
@@ -281,7 +278,6 @@ _public_ int sd_bus_set_monitor(sd_bus *bus, int b) {
SET_FLAG(bus->hello_flags, KDBUS_HELLO_MONITOR, b);
return 0;
}
-#endif // 0
_public_ int sd_bus_negotiate_fds(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
@@ -292,7 +288,6 @@ _public_ int sd_bus_negotiate_fds(sd_bus *bus, int b) {
return 0;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_negotiate_timestamp(sd_bus *bus, int b) {
uint64_t new_flags;
assert_return(bus, -EINVAL);
@@ -332,7 +327,6 @@ _public_ int sd_bus_negotiate_creds(sd_bus *bus, int b, uint64_t mask) {
return 0;
}
-#endif // 0
_public_ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) {
assert_return(bus, -EINVAL);
@@ -354,7 +348,6 @@ _public_ int sd_bus_set_anonymous(sd_bus *bus, int b) {
return 0;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_set_trusted(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
assert_return(bus->state == BUS_UNSET, -EPERM);
@@ -371,7 +364,6 @@ _public_ int sd_bus_set_description(sd_bus *bus, const char *description) {
return free_and_strdup(&bus->description, description);
}
-#endif // 0
_public_ int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
@@ -381,14 +373,12 @@ _public_ int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b) {
return 0;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_allow_interactive_authorization(sd_bus *bus) {
assert_return(bus, -EINVAL);
assert_return(!bus_pid_changed(bus), -ECHILD);
return bus->allow_interactive_authorization;
}
-#endif // 0
static int hello_callback(sd_bus_message *reply, void *userdata, sd_bus_error *error) {
const char *s;
@@ -1375,7 +1365,6 @@ _public_ sd_bus *sd_bus_unref(sd_bus *bus) {
return NULL;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_is_open(sd_bus *bus) {
assert_return(bus, -EINVAL);
@@ -1383,7 +1372,6 @@ _public_ int sd_bus_is_open(sd_bus *bus) {
return BUS_IS_OPEN(bus->state);
}
-#endif // 0
_public_ int sd_bus_can_send(sd_bus *bus, char type) {
int r;
@@ -1409,7 +1397,6 @@ _public_ int sd_bus_can_send(sd_bus *bus, char type) {
return bus_type_is_valid(type);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id) {
int r;
@@ -1424,7 +1411,6 @@ _public_ int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id) {
*id = bus->server_id;
return 0;
}
-#endif // 0
static int bus_seal_message(sd_bus *b, sd_bus_message *m, usec_t timeout) {
assert(b);
@@ -1686,7 +1672,6 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie) {
return bus_send_internal(bus, m, cookie, false);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie) {
int r;
@@ -1712,7 +1697,6 @@ _public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destinat
return sd_bus_send(bus, m, cookie);
}
-#endif // 0
static usec_t calc_elapse(uint64_t usec) {
if (usec == (uint64_t) -1)
@@ -1995,7 +1979,6 @@ fail:
return sd_bus_error_set_errno(error, r);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_fd(sd_bus *bus) {
assert_return(bus, -EINVAL);
@@ -2004,7 +1987,6 @@ _public_ int sd_bus_get_fd(sd_bus *bus) {
return bus->input_fd;
}
-#endif // 0
_public_ int sd_bus_get_events(sd_bus *bus) {
int flags = 0;
@@ -2718,11 +2700,9 @@ _public_ int sd_bus_process(sd_bus *bus, sd_bus_message **ret) {
return bus_process_internal(bus, false, 0, ret);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_process_priority(sd_bus *bus, int64_t priority, sd_bus_message **ret) {
return bus_process_internal(bus, true, priority, ret);
}
-#endif // 0
static int bus_poll(sd_bus *bus, bool need_more, uint64_t timeout_usec) {
struct pollfd p[2] = {};
@@ -2839,7 +2819,6 @@ _public_ int sd_bus_flush(sd_bus *bus) {
}
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_add_filter(
sd_bus *bus,
sd_bus_slot **slot,
@@ -2866,7 +2845,6 @@ _public_ int sd_bus_add_filter(
return 0;
}
-#endif // 0
_public_ int sd_bus_add_match(
sd_bus *bus,
@@ -3215,13 +3193,11 @@ _public_ sd_bus_message* sd_bus_get_current_message(sd_bus *bus) {
return bus->current_message;
}
-#if 0 /// UNNEEDED by elogind
_public_ sd_bus_slot* sd_bus_get_current_slot(sd_bus *bus) {
assert_return(bus, NULL);
return bus->current_slot;
}
-#endif // 0
_public_ sd_bus_message_handler_t sd_bus_get_current_handler(sd_bus *bus) {
assert_return(bus, NULL);
@@ -3315,7 +3291,6 @@ _public_ int sd_bus_default(sd_bus **ret) {
return sd_bus_default_system(ret);
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_tid(sd_bus *b, pid_t *tid) {
assert_return(b, -EINVAL);
assert_return(tid, -EINVAL);
@@ -3555,7 +3530,6 @@ _public_ int sd_bus_get_description(sd_bus *bus, const char **description) {
*description = bus->description;
return 0;
}
-#endif // 0
int bus_get_root_path(sd_bus *bus) {
int r;
@@ -3575,7 +3549,6 @@ int bus_get_root_path(sd_bus *bus) {
return r;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_get_scope(sd_bus *bus, const char **scope) {
assert_return(bus, -EINVAL);
assert_return(scope, -EINVAL);
@@ -3665,10 +3638,11 @@ static void flush_close(sd_bus *bus) {
_public_ void sd_bus_default_flush_close(void) {
flush_close(default_starter_bus);
+#if 0 /// elogind does not support user buses
flush_close(default_user_bus);
+#endif // 0
flush_close(default_system_bus);
}
-#endif // 0
_public_ int sd_bus_set_exit_on_disconnect(sd_bus *bus, int b) {
assert_return(bus, -EINVAL);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-24 21:09:20 +0000