summaryrefslogtreecommitdiff
path: root/src/libelogind
diff options
context:
space:
mode:
Diffstat (limited to 'src/libelogind')
-rw-r--r--src/libelogind/libelogind.sym24
-rw-r--r--src/libelogind/sd-bus/bus-kernel.c2
-rw-r--r--src/libelogind/sd-bus/bus-kernel.h2
-rw-r--r--src/libelogind/sd-bus/bus-message.c4
-rw-r--r--src/libelogind/sd-bus/sd-bus.c6
-rw-r--r--src/libelogind/sd-daemon/sd-daemon.c4
-rw-r--r--src/libelogind/sd-event/sd-event.c8
-rw-r--r--src/libelogind/sd-id128/id128-util.c2
-rw-r--r--src/libelogind/sd-id128/id128-util.h2
9 files changed, 26 insertions, 28 deletions
diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym
index a7c42eacf..167f08ef3 100644
--- a/src/libelogind/libelogind.sym
+++ b/src/libelogind/libelogind.sym
@@ -64,7 +64,7 @@ global:
/* sd_journal_open_container; */
/* sd-daemon */
- /* sd_booted; */
+ sd_booted;
/* sd_is_fifo; */
/* sd_is_mq; */
sd_is_socket;
@@ -188,11 +188,11 @@ global:
sd_bus_set_fd;
/* sd_bus_set_exec; */
/* sd_bus_get_address; */
- /* sd_bus_set_bus_client; */
+ sd_bus_set_bus_client;
/* sd_bus_is_bus_client; */
- /* sd_bus_set_server; */
+ sd_bus_set_server;
/* sd_bus_is_server; */
- /* sd_bus_set_anonymous; */
+ sd_bus_set_anonymous;
/* sd_bus_is_anonymous; */
/* sd_bus_set_trusted; */
/* sd_bus_is_trusted; */
@@ -202,7 +202,7 @@ global:
/* sd_bus_get_description; */
/* sd_bus_negotiate_creds; */
/* sd_bus_negotiate_timestamp; */
- /* sd_bus_negotiate_fds; */
+ sd_bus_negotiate_fds;
sd_bus_can_send;
/* sd_bus_get_creds_mask; */
sd_bus_set_allow_interactive_authorization;
@@ -282,7 +282,7 @@ global:
/* sd_bus_message_get_seqnum; */
sd_bus_message_get_bus;
sd_bus_message_get_creds;
- /* sd_bus_message_is_signal; */
+ sd_bus_message_is_signal;
sd_bus_message_is_method_call;
sd_bus_message_is_method_error;
/* sd_bus_message_is_empty; */
@@ -295,7 +295,7 @@ global:
sd_bus_message_append;
sd_bus_message_append_basic;
/* sd_bus_message_append_array; */
- /* sd_bus_message_append_array_space; */
+ sd_bus_message_append_array_space;
/* sd_bus_message_append_array_iovec; */
/* sd_bus_message_append_array_memfd; */
/* sd_bus_message_append_string_space; */
@@ -419,17 +419,17 @@ global:
sd_event_add_io;
sd_event_add_time;
sd_event_add_signal;
- /* sd_event_add_child; */
- /* sd_event_add_defer; */
+ sd_event_add_child;
+ sd_event_add_defer;
sd_event_add_post;
sd_event_add_exit;
sd_event_prepare;
sd_event_wait;
sd_event_dispatch;
sd_event_run;
- /* sd_event_loop; */
+ sd_event_loop;
sd_event_exit;
- /* sd_event_now; */
+ sd_event_now;
/* sd_event_get_fd; */
sd_event_get_state;
/* sd_event_get_tid; */
@@ -445,7 +445,7 @@ global:
/* sd_event_source_get_description; */
sd_event_source_set_prepare;
/* sd_event_source_get_pending; */
- /* sd_event_source_get_priority; */
+ sd_event_source_get_priority;
sd_event_source_set_priority;
/* sd_event_source_get_enabled; */
sd_event_source_set_enabled;
diff --git a/src/libelogind/sd-bus/bus-kernel.c b/src/libelogind/sd-bus/bus-kernel.c
index dce9b9b5d..c7a478139 100644
--- a/src/libelogind/sd-bus/bus-kernel.c
+++ b/src/libelogind/sd-bus/bus-kernel.c
@@ -1583,7 +1583,6 @@ uint64_t attach_flags_to_kdbus(uint64_t mask) {
return m;
}
-#if 0 /// UNNEEDED by elogind
int bus_kernel_create_bus(const char *name, bool world, char **s) {
struct kdbus_cmd *make;
struct kdbus_item *n;
@@ -1659,7 +1658,6 @@ int bus_kernel_create_bus(const char *name, bool world, char **s) {
return fd;
}
-#endif // 0
int bus_kernel_open_bus_fd(const char *bus, char **path) {
char *p;
diff --git a/src/libelogind/sd-bus/bus-kernel.h b/src/libelogind/sd-bus/bus-kernel.h
index 83109784b..eac75253c 100644
--- a/src/libelogind/sd-bus/bus-kernel.h
+++ b/src/libelogind/sd-bus/bus-kernel.h
@@ -69,8 +69,8 @@ int bus_kernel_read_message(sd_bus *bus, bool hint_priority, int64_t priority);
int bus_kernel_open_bus_fd(const char *bus, char **path);
-#if 0 /// UNNEEDED by elogind
int bus_kernel_create_bus(const char *name, bool world, char **s);
+#if 0 /// UNNEEDED by elogind
int bus_kernel_create_endpoint(const char *bus_name, const char *ep_name, char **path);
#endif // 0
diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c
index 129c612ec..1c5f885e1 100644
--- a/src/libelogind/sd-bus/bus-message.c
+++ b/src/libelogind/sd-bus/bus-message.c
@@ -1082,7 +1082,6 @@ _public_ sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m) {
return &m->creds;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_is_signal(
sd_bus_message *m,
const char *interface,
@@ -1101,7 +1100,6 @@ _public_ int sd_bus_message_is_signal(
return 1;
}
-#endif // 0
_public_ int sd_bus_message_is_method_call(
sd_bus_message *m,
@@ -2573,7 +2571,6 @@ _public_ int sd_bus_message_append(sd_bus_message *m, const char *types, ...) {
return r;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_append_array_space(
sd_bus_message *m,
char type,
@@ -2617,6 +2614,7 @@ _public_ int sd_bus_message_append_array_space(
return 0;
}
+#if 0 /// UNNEEDED by elogind
_public_ int sd_bus_message_append_array(
sd_bus_message *m,
char type,
diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index 4173ecde6..a4f20ca1e 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -262,6 +262,7 @@ _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,6 +273,7 @@ _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);
@@ -280,6 +282,7 @@ _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);
@@ -290,6 +293,7 @@ _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);
@@ -333,6 +337,7 @@ _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,6 +359,7 @@ _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);
diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c
index 3e66092b1..26a0a7e52 100644
--- a/src/libelogind/sd-daemon/sd-daemon.c
+++ b/src/libelogind/sd-daemon/sd-daemon.c
@@ -35,7 +35,7 @@
#include "alloc-util.h"
#include "fd-util.h"
-//#include "fs-util.h"
+#include "fs-util.h"
#include "parse-util.h"
#include "path-util.h"
#include "socket-util.h"
@@ -631,6 +631,7 @@ _public_ int sd_notifyf(int unset_environment, const char *format, ...) {
return sd_pid_notify(0, unset_environment, p);
}
+#endif // 0
_public_ int sd_booted(void) {
/* We test whether the runtime unit file directory has been
@@ -639,7 +640,6 @@ _public_ int sd_booted(void) {
return laccess("/run/systemd/system/", F_OK) >= 0;
}
-#endif // 0
_public_ int sd_watchdog_enabled(int unset_environment, uint64_t *usec) {
const char *s, *p = ""; /* p is set to dummy value to do unsetting */
diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c
index 019d411c4..0f7a0ca7b 100644
--- a/src/libelogind/sd-event/sd-event.c
+++ b/src/libelogind/sd-event/sd-event.c
@@ -1196,7 +1196,6 @@ _public_ int sd_event_add_signal(
return 0;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_event_add_child(
sd_event *e,
sd_event_source **ret,
@@ -1289,7 +1288,6 @@ _public_ int sd_event_add_defer(
return 0;
}
-#endif // 0
_public_ int sd_event_add_post(
sd_event *e,
@@ -1546,6 +1544,7 @@ _public_ int sd_event_source_get_signal(sd_event_source *s) {
return s->signal.sig;
}
+#endif // 0
_public_ int sd_event_source_get_priority(sd_event_source *s, int64_t *priority) {
assert_return(s, -EINVAL);
@@ -1554,7 +1553,6 @@ _public_ int sd_event_source_get_priority(sd_event_source *s, int64_t *priority)
*priority = s->priority;
return 0;
}
-#endif // 0
_public_ int sd_event_source_set_priority(sd_event_source *s, int64_t priority) {
int r;
@@ -2717,7 +2715,6 @@ _public_ int sd_event_run(sd_event *e, uint64_t timeout) {
return r;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_event_loop(sd_event *e) {
int r;
@@ -2740,6 +2737,7 @@ finish:
return r;
}
+#if 0 /// UNNEEDED by elogind
_public_ int sd_event_get_fd(sd_event *e) {
assert_return(e, -EINVAL);
@@ -2781,7 +2779,6 @@ _public_ int sd_event_exit(sd_event *e, int code) {
return 0;
}
-#if 0 /// UNNEEDED by elogind
_public_ int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec) {
assert_return(e, -EINVAL);
assert_return(usec, -EINVAL);
@@ -2806,7 +2803,6 @@ _public_ int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec) {
*usec = triple_timestamp_by_clock(&e->timestamp, clock);
return 0;
}
-#endif // 0
_public_ int sd_event_default(sd_event **ret) {
diff --git a/src/libelogind/sd-id128/id128-util.c b/src/libelogind/sd-id128/id128-util.c
index 6c1c7f02d..ce8a6aad0 100644
--- a/src/libelogind/sd-id128/id128-util.c
+++ b/src/libelogind/sd-id128/id128-util.c
@@ -153,7 +153,6 @@ int id128_read(const char *p, Id128Format f, sd_id128_t *ret) {
return id128_read_fd(fd, f, ret);
}
-#if 0 /// UNNEEDED by elogind
int id128_write_fd(int fd, Id128Format f, sd_id128_t id, bool do_sync) {
char buffer[36 + 2];
size_t sz;
@@ -184,6 +183,7 @@ int id128_write_fd(int fd, Id128Format f, sd_id128_t id, bool do_sync) {
return r;
}
+#if 0 /// UNNEEDED by elogind
int id128_write(const char *p, Id128Format f, sd_id128_t id, bool do_sync) {
_cleanup_close_ int fd = -1;
diff --git a/src/libelogind/sd-id128/id128-util.h b/src/libelogind/sd-id128/id128-util.h
index e5262cdcd..d435b976d 100644
--- a/src/libelogind/sd-id128/id128-util.h
+++ b/src/libelogind/sd-id128/id128-util.h
@@ -43,8 +43,8 @@ typedef enum Id128Format {
int id128_read_fd(int fd, Id128Format f, sd_id128_t *ret);
int id128_read(const char *p, Id128Format f, sd_id128_t *ret);
-#if 0 /// UNNEEDED by elogind
int id128_write_fd(int fd, Id128Format f, sd_id128_t id, bool do_sync);
+#if 0 /// UNNEEDED by elogind
int id128_write(const char *p, Id128Format f, sd_id128_t id, bool do_sync);
void id128_hash_func(const void *p, struct siphash *state);
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 10:44:56 +0000