From 2e694aaeec158dba9dc12d8eea1755e201830a81 Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Sun, 9 Apr 2017 20:56:14 +0200 Subject: Prep v227: Clean up some headers in src/systemd - src/systemd/sd-bus.h - src/systemd/sd-daemon.h - src/systemd/sd-event.h --- cb/elogind.cbp | 2 -- src/libelogind/libelogind.sym | 60 ++++++++++++++++++++---------------- src/libelogind/sd-bus/bus-message.c | 11 +++---- src/libelogind/sd-bus/sd-bus.c | 19 +++++++----- src/libelogind/sd-daemon/sd-daemon.c | 3 ++ src/libelogind/sd-event/sd-event.c | 9 ++++++ src/systemd/sd-bus.h | 22 ++++++------- src/systemd/sd-daemon.h | 2 +- src/systemd/sd-event.h | 8 ++--- 9 files changed, 76 insertions(+), 60 deletions(-) diff --git a/cb/elogind.cbp b/cb/elogind.cbp index 7b2276bf6..d7168fc00 100644 --- a/cb/elogind.cbp +++ b/cb/elogind.cbp @@ -62,12 +62,10 @@ - - diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym index 7b9854a7e..77c69f8fd 100644 --- a/src/libelogind/libelogind.sym +++ b/src/libelogind/libelogind.sym @@ -142,16 +142,19 @@ global: sd_uid_get_display; } LIBSYSTEMD_211; -LIBSYSTEMD_214 { -global: - sd_pid_notify; - /* sd_pid_notifyf; */ -} LIBSYSTEMD_213; +/* + * These methods are not needed by elogind. + * LIBSYSTEMD_214 { + * global: + * sd_pid_notify; + * sd_pid_notifyf; + * } LIBSYSTEMD_213; + */ LIBSYSTEMD_216 { global: sd_machine_get_ifindices; -} LIBSYSTEMD_214; +} LIBSYSTEMD_213; LIBSYSTEMD_217 { global: @@ -187,7 +190,7 @@ global: /* sd_bus_get_address; */ /* 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_is_anonymous; */ @@ -197,7 +200,7 @@ global: /* sd_bus_is_monitor; */ /* sd_bus_set_description; */ /* sd_bus_get_description; */ - sd_bus_negotiate_creds; + /* sd_bus_negotiate_creds; */ /* sd_bus_negotiate_timestamp; */ /* sd_bus_negotiate_fds; */ sd_bus_can_send; @@ -206,7 +209,7 @@ global: /* sd_bus_get_allow_interactive_authorization; */ sd_bus_start; sd_bus_close; - sd_bus_try_close; + /* sd_bus_try_close; */ sd_bus_ref; sd_bus_unref; /* sd_bus_is_open; */ @@ -215,10 +218,10 @@ global: /* sd_bus_get_tid; */ sd_bus_get_owner_creds; sd_bus_send; - sd_bus_send_to; + /* sd_bus_send_to; */ sd_bus_call; sd_bus_call_async; - sd_bus_get_fd; + /* sd_bus_get_fd; */ sd_bus_get_events; sd_bus_get_timeout; sd_bus_process; @@ -232,7 +235,7 @@ global: sd_bus_attach_event; sd_bus_detach_event; sd_bus_get_event; - sd_bus_add_filter; + /* sd_bus_add_filter; */ sd_bus_add_match; sd_bus_add_object; sd_bus_add_fallback; @@ -285,17 +288,17 @@ global: /* sd_bus_message_is_empty; */ /* sd_bus_message_has_signature; */ /* sd_bus_message_set_expect_reply; */ - sd_bus_message_set_auto_start; + /* sd_bus_message_set_auto_start; */ /* sd_bus_message_set_allow_interactive_authorization; */ sd_bus_message_set_destination; /* sd_bus_message_set_priority; */ 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; */ + /* sd_bus_message_append_array_space; */ /* sd_bus_message_append_array_iovec; */ /* sd_bus_message_append_array_memfd; */ - sd_bus_message_append_string_space; + /* sd_bus_message_append_string_space; */ /* sd_bus_message_append_string_iovec; */ /* sd_bus_message_append_string_memfd; */ sd_bus_message_append_strv; @@ -416,8 +419,8 @@ 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; @@ -429,8 +432,8 @@ global: /* sd_event_now; */ /* sd_event_get_fd; */ sd_event_get_state; - sd_event_get_tid; - sd_event_get_exit_code; + /* sd_event_get_tid; */ + /* sd_event_get_exit_code; */ sd_event_set_watchdog; /* sd_event_get_watchdog; */ /* sd_event_source_ref; */ @@ -474,10 +477,13 @@ global: sd_peer_get_cgroup; } LIBSYSTEMD_222; -LIBSYSTEMD_227 { -global: - sd_bus_default_flush_close; - /* sd_bus_path_decode_many; */ - /* sd_bus_path_encode_many; */ - /* sd_listen_fds_with_names; */ -} LIBSYSTEMD_226; +/* + * These methods are not needed by elogind. + * LIBSYSTEMD_227 { + * global: + * sd_bus_default_flush_close; + * sd_bus_path_decode_many; + * sd_bus_path_encode_many; + * sd_listen_fds_with_names; + * } LIBSYSTEMD_226; +*/ diff --git a/src/libelogind/sd-bus/bus-message.c b/src/libelogind/sd-bus/bus-message.c index 36b8ebea0..7b1216989 100644 --- a/src/libelogind/sd-bus/bus-message.c +++ b/src/libelogind/sd-bus/bus-message.c @@ -1148,7 +1148,6 @@ _public_ int sd_bus_message_set_expect_reply(sd_bus_message *m, int b) { return 0; } -#endif // 0 _public_ int sd_bus_message_set_auto_start(sd_bus_message *m, int b) { assert_return(m, -EINVAL); @@ -1162,8 +1161,6 @@ _public_ int sd_bus_message_set_auto_start(sd_bus_message *m, int b) { return 0; } -/// UNNEEDED by elogind -#if 0 _public_ int sd_bus_message_set_allow_interactive_authorization(sd_bus_message *m, int b) { assert_return(m, -EINVAL); assert_return(!m->sealed, -EPERM); @@ -1670,6 +1667,8 @@ _public_ int sd_bus_message_append_basic(sd_bus_message *m, char type, const voi return message_append_basic(m, type, p, NULL); } +/// UNNEEDED by elogind +#if 0 _public_ int sd_bus_message_append_string_space( sd_bus_message *m, size_t size, @@ -1727,8 +1726,6 @@ _public_ int sd_bus_message_append_string_space( return 0; } -/// UNNEEDED by elogind -#if 0 _public_ int sd_bus_message_append_string_iovec( sd_bus_message *m, const struct iovec *iov, @@ -2587,6 +2584,8 @@ _public_ int sd_bus_message_append(sd_bus_message *m, const char *types, ...) { return r; } +/// UNNEEDED by elogind +#if 0 _public_ int sd_bus_message_append_array_space( sd_bus_message *m, char type, @@ -2654,8 +2653,6 @@ _public_ int sd_bus_message_append_array( return 0; } -/// UNNEEDED by elogind -#if 0 _public_ int sd_bus_message_append_array_iovec( 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 15f5fe133..4340a2197 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -70,7 +70,7 @@ static int attach_io_events(sd_bus *b); static void detach_io_events(sd_bus *b); static thread_local sd_bus *default_system_bus = NULL; -static thread_local sd_bus *default_user_bus = NULL; +// UNNEEDED static thread_local sd_bus *default_user_bus = NULL; static thread_local sd_bus *default_starter_bus = NULL; static void bus_close_fds(sd_bus *b) { @@ -303,7 +303,6 @@ _public_ int sd_bus_negotiate_timestamp(sd_bus *bus, int b) { return 0; } -#endif // 0 _public_ int sd_bus_negotiate_creds(sd_bus *bus, int b, uint64_t mask) { uint64_t new_flags; @@ -344,8 +343,6 @@ _public_ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t server_id) { return 0; } -/// UNNEEDED by elogind -#if 0 _public_ int sd_bus_set_anonymous(sd_bus *bus, int b) { assert_return(bus, -EINVAL); assert_return(bus->state == BUS_UNSET, -EPERM); @@ -1847,6 +1844,8 @@ _public_ int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie) { return bus_send_internal(bus, m, cookie, false); } +/// UNNEEDED by elogind +#if 0 _public_ int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie) { int r; @@ -1872,6 +1871,7 @@ _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) @@ -2156,6 +2156,8 @@ fail: return sd_bus_error_set_errno(error, r); } +/// UNNEEDED by elogind +#if 0 _public_ int sd_bus_get_fd(sd_bus *bus) { assert_return(bus, -EINVAL); @@ -2164,6 +2166,7 @@ _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; @@ -2961,6 +2964,8 @@ _public_ int sd_bus_flush(sd_bus *bus) { } } +/// UNNEEDED by elogind +#if 0 _public_ int sd_bus_add_filter( sd_bus *bus, sd_bus_slot **slot, @@ -2987,6 +2992,7 @@ _public_ int sd_bus_add_filter( return 0; } +#endif // 0 _public_ int sd_bus_add_match( sd_bus *bus, @@ -3669,7 +3675,6 @@ _public_ int sd_bus_path_decode_many(const char *path, const char *path_template labels = NULL; return 1; } -#endif // 0 _public_ int sd_bus_try_close(sd_bus *bus) { int r; @@ -3697,8 +3702,6 @@ _public_ int sd_bus_try_close(sd_bus *bus) { return 0; } -/// UNNEEDED by elogind -#if 0 _public_ int sd_bus_get_description(sd_bus *bus, const char **description) { assert_return(bus, -EINVAL); assert_return(description, -EINVAL); @@ -3827,7 +3830,6 @@ _public_ int sd_bus_is_monitor(sd_bus *bus) { return !!(bus->hello_flags & KDBUS_HELLO_MONITOR); } -#endif // 0 static void flush_close(sd_bus *bus) { if (!bus) @@ -3845,3 +3847,4 @@ _public_ void sd_bus_default_flush_close(void) { flush_close(default_user_bus); flush_close(default_system_bus); } +#endif // 0 diff --git a/src/libelogind/sd-daemon/sd-daemon.c b/src/libelogind/sd-daemon/sd-daemon.c index c6224f8c7..b26ecf26d 100644 --- a/src/libelogind/sd-daemon/sd-daemon.c +++ b/src/libelogind/sd-daemon/sd-daemon.c @@ -513,9 +513,12 @@ finish: return r; } +/// UNNEEDED by elogind +#if 0 _public_ int sd_pid_notify(pid_t pid, int unset_environment, const char *state) { return sd_pid_notify_with_fds(pid, unset_environment, state, NULL, 0); } +#endif // 0 _public_ int sd_notify(int unset_environment, const char *state) { return sd_pid_notify_with_fds(0, unset_environment, state, NULL, 0); diff --git a/src/libelogind/sd-event/sd-event.c b/src/libelogind/sd-event/sd-event.c index 0a3842ed5..f6d0d1054 100644 --- a/src/libelogind/sd-event/sd-event.c +++ b/src/libelogind/sd-event/sd-event.c @@ -1165,6 +1165,8 @@ _public_ int sd_event_add_signal( return 0; } +/// UNNEEDED by elogind +#if 0 _public_ int sd_event_add_child( sd_event *e, sd_event_source **ret, @@ -1257,6 +1259,7 @@ _public_ int sd_event_add_defer( return 0; } +#endif // 0 _public_ int sd_event_add_post( sd_event *e, @@ -2699,6 +2702,8 @@ _public_ int sd_event_get_state(sd_event *e) { return e->state; } +/// UNNEEDED by elogind +#if 0 _public_ int sd_event_get_exit_code(sd_event *e, int *code) { assert_return(e, -EINVAL); assert_return(code, -EINVAL); @@ -2710,6 +2715,7 @@ _public_ int sd_event_get_exit_code(sd_event *e, int *code) { *code = e->exit_code; return 0; } +#endif // 0 _public_ int sd_event_exit(sd_event *e, int code) { assert_return(e, -EINVAL); @@ -2783,6 +2789,8 @@ _public_ int sd_event_default(sd_event **ret) { return 1; } +/// UNNEEDED by elogind +#if 0 _public_ int sd_event_get_tid(sd_event *e, pid_t *tid) { assert_return(e, -EINVAL); assert_return(tid, -EINVAL); @@ -2795,6 +2803,7 @@ _public_ int sd_event_get_tid(sd_event *e, pid_t *tid) { return -ENXIO; } +#endif // 0 _public_ int sd_event_set_watchdog(sd_event *e, int b) { int r; diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index 757f71042..b2f2b6ace 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -131,7 +131,7 @@ int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd); // UNNEEDED int sd_bus_get_address(sd_bus *bus, const char **address); // UNNEEDED int sd_bus_set_bus_client(sd_bus *bus, int b); // UNNEEDED int sd_bus_is_bus_client(sd_bus *bus); -int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t bus_id); +// UNNEEDED int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t bus_id); // UNNEEDED int sd_bus_is_server(sd_bus *bus); // UNNEEDED int sd_bus_set_anonymous(sd_bus *bus, int b); // UNNEEDED int sd_bus_is_anonymous(sd_bus *bus); @@ -141,7 +141,7 @@ int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t bus_id); // UNNEEDED int sd_bus_is_monitor(sd_bus *bus); // UNNEEDED int sd_bus_set_description(sd_bus *bus, const char *description); // UNNEEDED int sd_bus_get_description(sd_bus *bus, const char **description); -int sd_bus_negotiate_creds(sd_bus *bus, int b, uint64_t creds_mask); +// UNNEEDED int sd_bus_negotiate_creds(sd_bus *bus, int b, uint64_t creds_mask); // UNNEEDED int sd_bus_negotiate_timestamp(sd_bus *bus, int b); // UNNEEDED int sd_bus_negotiate_fds(sd_bus *bus, int b); int sd_bus_can_send(sd_bus *bus, char type); @@ -151,14 +151,14 @@ int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b); int sd_bus_start(sd_bus *ret); -int sd_bus_try_close(sd_bus *bus); +// UNNEEDED int sd_bus_try_close(sd_bus *bus); void sd_bus_close(sd_bus *bus); sd_bus *sd_bus_ref(sd_bus *bus); sd_bus *sd_bus_unref(sd_bus *bus); sd_bus *sd_bus_flush_close_unref(sd_bus *bus); -void sd_bus_default_flush_close(void); +// UNNEEDED void sd_bus_default_flush_close(void); // UNNEEDED int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id); // UNNEEDED int sd_bus_get_scope(sd_bus *bus, const char **scope); @@ -166,11 +166,11 @@ void sd_bus_default_flush_close(void); int sd_bus_get_owner_creds(sd_bus *bus, uint64_t creds_mask, sd_bus_creds **ret); int sd_bus_send(sd_bus *bus, sd_bus_message *m, uint64_t *cookie); -int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie); +// UNNEEDED int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie); int sd_bus_call(sd_bus *bus, sd_bus_message *m, uint64_t usec, sd_bus_error *ret_error, sd_bus_message **reply); int sd_bus_call_async(sd_bus *bus, sd_bus_slot **slot, sd_bus_message *m, sd_bus_message_handler_t callback, void *userdata, uint64_t usec); -int sd_bus_get_fd(sd_bus *bus); +// UNNEEDED int sd_bus_get_fd(sd_bus *bus); int sd_bus_get_events(sd_bus *bus); int sd_bus_get_timeout(sd_bus *bus, uint64_t *timeout_usec); int sd_bus_process(sd_bus *bus, sd_bus_message **r); @@ -187,7 +187,7 @@ int sd_bus_attach_event(sd_bus *bus, sd_event *e, int priority); int sd_bus_detach_event(sd_bus *bus); sd_event *sd_bus_get_event(sd_bus *bus); -int sd_bus_add_filter(sd_bus *bus, sd_bus_slot **slot, sd_bus_message_handler_t callback, void *userdata); +// UNNEEDED int sd_bus_add_filter(sd_bus *bus, sd_bus_slot **slot, sd_bus_message_handler_t callback, void *userdata); int sd_bus_add_match(sd_bus *bus, sd_bus_slot **slot, const char *match, sd_bus_message_handler_t callback, void *userdata); int sd_bus_add_object(sd_bus *bus, sd_bus_slot **slot, const char *path, sd_bus_message_handler_t callback, void *userdata); int sd_bus_add_fallback(sd_bus *bus, sd_bus_slot **slot, const char *prefix, sd_bus_message_handler_t callback, void *userdata); @@ -256,7 +256,7 @@ int sd_bus_message_is_method_error(sd_bus_message *m, const char *name); // UNNEEDED int sd_bus_message_has_signature(sd_bus_message *m, const char *signature); // UNNEEDED int sd_bus_message_set_expect_reply(sd_bus_message *m, int b); -int sd_bus_message_set_auto_start(sd_bus_message *m, int b); +// UNNEEDED int sd_bus_message_set_auto_start(sd_bus_message *m, int b); // UNNEEDED int sd_bus_message_set_allow_interactive_authorization(sd_bus_message *m, int b); int sd_bus_message_set_destination(sd_bus_message *m, const char *destination); @@ -264,11 +264,11 @@ int sd_bus_message_set_destination(sd_bus_message *m, const char *destination); int sd_bus_message_append(sd_bus_message *m, const char *types, ...); int sd_bus_message_append_basic(sd_bus_message *m, char type, const void *p); -int sd_bus_message_append_array(sd_bus_message *m, char type, const void *ptr, size_t size); -int sd_bus_message_append_array_space(sd_bus_message *m, char type, size_t size, void **ptr); +// UNNEEDED int sd_bus_message_append_array(sd_bus_message *m, char type, const void *ptr, size_t size); +// UNNEEDED int sd_bus_message_append_array_space(sd_bus_message *m, char type, size_t size, void **ptr); // UNNEEDED int sd_bus_message_append_array_iovec(sd_bus_message *m, char type, const struct iovec *iov, unsigned n); // UNNEEDED int sd_bus_message_append_array_memfd(sd_bus_message *m, char type, int memfd, uint64_t offset, uint64_t size); -int sd_bus_message_append_string_space(sd_bus_message *m, size_t size, char **s); +// UNNEEDED int sd_bus_message_append_string_space(sd_bus_message *m, size_t size, char **s); // UNNEEDED int sd_bus_message_append_string_iovec(sd_bus_message *m, const struct iovec *iov, unsigned n); // UNNEEDED int sd_bus_message_append_string_memfd(sd_bus_message *m, int memfd, uint64_t offset, uint64_t size); int sd_bus_message_append_strv(sd_bus_message *m, char **l); diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index 7b7df571e..2d573fde9 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -242,7 +242,7 @@ int sd_notify(int unset_environment, const char *state); Similar to sd_notify(), but send the message on behalf of another process, if the appropriate permissions are available. */ -int sd_pid_notify(pid_t pid, int unset_environment, const char *state); +// UNNEEDED int sd_pid_notify(pid_t pid, int unset_environment, const char *state); /* Similar to sd_notifyf(), but send the message on behalf of another diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index 3cf7661fd..1adb26ee4 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -81,8 +81,8 @@ sd_event* sd_event_unref(sd_event *e); int sd_event_add_io(sd_event *e, sd_event_source **s, int fd, uint32_t events, sd_event_io_handler_t callback, void *userdata); int sd_event_add_time(sd_event *e, sd_event_source **s, clockid_t clock, uint64_t usec, uint64_t accuracy, sd_event_time_handler_t callback, void *userdata); int sd_event_add_signal(sd_event *e, sd_event_source **s, int sig, sd_event_signal_handler_t callback, void *userdata); -int sd_event_add_child(sd_event *e, sd_event_source **s, pid_t pid, int options, sd_event_child_handler_t callback, void *userdata); -int sd_event_add_defer(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); +// UNNEEDED int sd_event_add_child(sd_event *e, sd_event_source **s, pid_t pid, int options, sd_event_child_handler_t callback, void *userdata); +// UNNEEDED int sd_event_add_defer(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); int sd_event_add_post(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); int sd_event_add_exit(sd_event *e, sd_event_source **s, sd_event_handler_t callback, void *userdata); @@ -97,8 +97,8 @@ int sd_event_exit(sd_event *e, int code); // UNNEEDED int sd_event_get_fd(sd_event *e); int sd_event_get_state(sd_event *e); -int sd_event_get_tid(sd_event *e, pid_t *tid); -int sd_event_get_exit_code(sd_event *e, int *code); +// UNNEEDED int sd_event_get_tid(sd_event *e, pid_t *tid); +// UNNEEDED int sd_event_get_exit_code(sd_event *e, int *code); int sd_event_set_watchdog(sd_event *e, int b); // UNNEEDED int sd_event_get_watchdog(sd_event *e); -- cgit v1.2.3