From 756c392103bc01d409c1760146ac2df7dd8f8ede Mon Sep 17 00:00:00 2001 From: Sven Eden Date: Tue, 11 Apr 2017 17:08:00 +0200 Subject: [PATCH] Prep v228: Substitute declaration masks (4/4) --- src/libelogind/sd-bus/bus-match.h | 5 +- src/libelogind/sd-bus/bus-message.h | 10 +- src/libelogind/sd-bus/sd-bus.c | 5 +- src/login/logind-seat.h | 5 +- src/login/logind.h | 44 ++-- src/shared/acl-util.h | 13 +- src/shared/bus-util.h | 68 ++++-- src/shared/conf-parser.c | 5 +- src/shared/conf-parser.h | 27 ++- src/shared/pager.h | 5 +- src/shared/udev-util.h | 26 ++- src/systemd/sd-bus.h | 307 +++++++++++++++++++--------- src/systemd/sd-daemon.h | 34 ++- src/systemd/sd-event.h | 85 +++++--- 14 files changed, 437 insertions(+), 202 deletions(-) diff --git a/src/libelogind/sd-bus/bus-match.h b/src/libelogind/sd-bus/bus-match.h index c33f35dbc..d30873665 100644 --- a/src/libelogind/sd-bus/bus-match.h +++ b/src/libelogind/sd-bus/bus-match.h @@ -97,6 +97,9 @@ enum bus_match_node_type bus_match_node_type_from_string(const char *k, size_t n int bus_match_parse(const char *match, struct bus_match_component **_components, unsigned *_n_components); void bus_match_parse_free(struct bus_match_component *components, unsigned n_components); -// UNNEEDED char *bus_match_to_string(struct bus_match_component *components, unsigned n_components); +/// UNNEEDED by elogind +#if 0 +char *bus_match_to_string(struct bus_match_component *components, unsigned n_components); +#endif // 0 enum bus_match_scope bus_match_get_scope(const struct bus_match_component *components, unsigned n_components); diff --git a/src/libelogind/sd-bus/bus-message.h b/src/libelogind/sd-bus/bus-message.h index 8aca18381..7efe3ffe8 100644 --- a/src/libelogind/sd-bus/bus-message.h +++ b/src/libelogind/sd-bus/bus-message.h @@ -194,7 +194,10 @@ static inline bool BUS_MESSAGE_IS_GVARIANT(sd_bus_message *m) { } int bus_message_seal(sd_bus_message *m, uint64_t serial, usec_t timeout); -// UNNEEDED int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz); +/// UNNEEDED by elogind +#if 0 +int bus_message_get_blob(sd_bus_message *m, void **buffer, size_t *sz); +#endif // 0 int bus_message_read_strv_extend(sd_bus_message *m, char ***l); int bus_message_from_header( @@ -240,7 +243,10 @@ int bus_message_new_synthetic_error(sd_bus *bus, uint64_t serial, const sd_bus_e int bus_message_remarshal(sd_bus *bus, sd_bus_message **m); -// UNNEEDED int bus_message_append_sender(sd_bus_message *m, const char *sender); +/// UNNEEDED by elogind +#if 0 +int bus_message_append_sender(sd_bus_message *m, const char *sender); +#endif // 0 void bus_message_set_sender_driver(sd_bus *bus, sd_bus_message *m); void bus_message_set_sender_local(sd_bus *bus, sd_bus_message *m); diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c index 7e733cdea..630c84935 100644 --- a/src/libelogind/sd-bus/sd-bus.c +++ b/src/libelogind/sd-bus/sd-bus.c @@ -75,7 +75,10 @@ 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; -// UNNEEDED static thread_local sd_bus *default_user_bus = NULL; +/// UNNEEDED by elogind +#if 0 +static thread_local sd_bus *default_user_bus = NULL; +#endif // 0 static thread_local sd_bus *default_starter_bus = NULL; static void bus_close_fds(sd_bus *b) { diff --git a/src/login/logind-seat.h b/src/login/logind-seat.h index fe13aabfc..3e628cb78 100644 --- a/src/login/logind-seat.h +++ b/src/login/logind-seat.h @@ -60,7 +60,10 @@ int seat_switch_to_next(Seat *s); int seat_switch_to_previous(Seat *s); int seat_active_vt_changed(Seat *s, unsigned int vtnr); int seat_read_active_vt(Seat *s); -// UNNEEDED int seat_preallocate_vts(Seat *s); +/// UNNEEDED by elogind +#if 0 +int seat_preallocate_vts(Seat *s); +#endif // 0 int seat_attach_session(Seat *s, Session *session); void seat_complete_switch(Seat *s); diff --git a/src/login/logind.h b/src/login/logind.h index c4bfd92cf..ebd6944d8 100644 --- a/src/login/logind.h +++ b/src/login/logind.h @@ -179,7 +179,10 @@ int manager_add_inhibitor(Manager *m, const char* id, Inhibitor **_inhibitor); int manager_process_seat_device(Manager *m, struct udev_device *d); int manager_process_button_device(Manager *m, struct udev_device *d); -// UNNEEDED int manager_spawn_autovt(Manager *m, unsigned int vtnr); +/// UNNEEDED by elogind +#if 0 +int manager_spawn_autovt(Manager *m, unsigned int vtnr); +#endif // 0 bool manager_shall_kill(Manager *m, const char *user); @@ -192,28 +195,32 @@ bool manager_is_docked_or_external_displays(Manager *m); extern const sd_bus_vtable manager_vtable[]; -// UNNEEDED int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); -// UNNEEDED int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); -// UNNEEDED int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); -// UNNEEDED int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error); -// UNNEEDED int match_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); - -/// eloginds own version does the action itself +/// UNNEEDED by elogind #if 0 +int match_job_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_unit_removed(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_properties_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_reloading(sd_bus_message *message, void *userdata, sd_bus_error *error); +int match_name_owner_changed(sd_bus_message *message, void *userdata, sd_bus_error *error); + int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, const char *unit_name, InhibitWhat w, sd_bus_error *error); #else +/// eloginds own version does the action itself int bus_manager_shutdown_or_sleep_now_or_later(Manager *m, HandleAction action, InhibitWhat w, sd_bus_error *error); #endif // 0 int manager_send_changed(Manager *manager, const char *property, ...) _sentinel_; -// UNNEEDED int manager_start_slice(Manager *manager, const char *slice, const char *description, const char *after, const char *after2, uint64_t tasks_max, sd_bus_error *error, char **job);// UNNEEDED int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, sd_bus_error *error, char **job); -// UNNEEDED int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); -// UNNEEDED int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); -// UNNEEDED int manager_abandon_scope(Manager *manager, const char *scope, sd_bus_error *error); -// UNNEEDED int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, sd_bus_error *error); -// UNNEEDED int manager_unit_is_active(Manager *manager, const char *unit); -// UNNEEDED int manager_job_is_active(Manager *manager, const char *path); +/// UNNEEDED by elogind +#if 0 +int manager_start_slice(Manager *manager, const char *slice, const char *description, const char *after, const char *after2, uint64_t tasks_max, sd_bus_error *error, char **job);// UNNEEDED int manager_start_scope(Manager *manager, const char *scope, pid_t pid, const char *slice, const char *description, const char *after, const char *after2, sd_bus_error *error, char **job); +int manager_start_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); +int manager_stop_unit(Manager *manager, const char *unit, sd_bus_error *error, char **job); +int manager_abandon_scope(Manager *manager, const char *scope, sd_bus_error *error); +int manager_kill_unit(Manager *manager, const char *unit, KillWho who, int signo, sd_bus_error *error); +int manager_unit_is_active(Manager *manager, const char *unit); +int manager_job_is_active(Manager *manager, const char *path); +#endif // 0 /* gperf lookup function */ const struct ConfigPerfItem* logind_gperf_lookup(const char *key, GPERF_LEN_TYPE length); @@ -226,7 +233,10 @@ int manager_get_session_from_creds(Manager *m, sd_bus_message *message, const ch int manager_get_user_from_creds(Manager *m, sd_bus_message *message, uid_t uid, sd_bus_error *error, User **ret); int manager_get_seat_from_creds(Manager *m, sd_bus_message *message, const char *name, sd_bus_error *error, Seat **ret); -// UNNEEDED int manager_setup_wall_message_timer(Manager *m); -// UNNEEDED bool logind_wall_tty_filter(const char *tty, void *userdata); +/// UNNEEDED by elogind +#if 0 +int manager_setup_wall_message_timer(Manager *m); +bool logind_wall_tty_filter(const char *tty, void *userdata); +#endif // 0 int manager_dispatch_delayed(Manager *manager, bool timeout); diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h index 90178141e..10c3ec371 100644 --- a/src/shared/acl-util.h +++ b/src/shared/acl-util.h @@ -30,11 +30,14 @@ #include "macro.h" int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry); -// UNNEEDED int calc_acl_mask_if_needed(acl_t *acl_p); -// UNNEEDED int add_base_acls_if_needed(acl_t *acl_p, const char *path); -// UNNEEDED int acl_search_groups(const char* path, char ***ret_groups); -// UNNEEDED int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask); -// UNNEEDED int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl); +/// UNNEEDED by elogind +#if 0 +int calc_acl_mask_if_needed(acl_t *acl_p); +int add_base_acls_if_needed(acl_t *acl_p, const char *path); +int acl_search_groups(const char* path, char ***ret_groups); +int parse_acl(const char *text, acl_t *acl_access, acl_t *acl_default, bool want_mask); +int acls_for_file(const char *path, acl_type_t type, acl_t new, acl_t *acl); +#endif // 0 /* acl_free takes multiple argument types. * Multiple cleanup functions are necessary. */ diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h index cb15a3b56..47811a744 100644 --- a/src/shared/bus-util.h +++ b/src/shared/bus-util.h @@ -49,29 +49,47 @@ struct bus_properties_map { int bus_map_id128(sd_bus *bus, const char *member, sd_bus_message *m, sd_bus_error *error, void *userdata); int bus_message_map_all_properties(sd_bus_message *m, const struct bus_properties_map *map, void *userdata); -// UNNEEDED int bus_message_map_properties_changed(sd_bus_message *m, const struct bus_properties_map *map, void *userdata); +/// UNNEEDED by elogind +#if 0 +int bus_message_map_properties_changed(sd_bus_message *m, const struct bus_properties_map *map, void *userdata); +#endif // 0 int bus_map_all_properties(sd_bus *bus, const char *destination, const char *path, const struct bus_properties_map *map, void *userdata); -// UNNEEDED int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name); +/// UNNEEDED by elogind +#if 0 +int bus_async_unregister_and_exit(sd_event *e, sd_bus *bus, const char *name); +#endif // 0 typedef bool (*check_idle_t)(void *userdata); -// UNNEEDED int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout, check_idle_t check_idle, void *userdata); +/// UNNEEDED by elogind +#if 0 +int bus_event_loop_with_idle(sd_event *e, sd_bus *bus, const char *name, usec_t timeout, check_idle_t check_idle, void *userdata); +#endif // 0 int bus_name_has_owner(sd_bus *c, const char *name, sd_bus_error *error); -// UNNEEDED int bus_check_peercred(sd_bus *c); +/// UNNEEDED by elogind +#if 0 +int bus_check_peercred(sd_bus *c); +#endif // 0 int bus_test_polkit(sd_bus_message *call, int capability, const char *action, const char **details, uid_t good_user, bool *_challenge, sd_bus_error *e); int bus_verify_polkit_async(sd_bus_message *call, int capability, const char *action, const char **details, bool interactive, uid_t good_user, Hashmap **registry, sd_bus_error *error); void bus_verify_polkit_async_registry_free(Hashmap *registry); -// UNNEEDED int bus_open_system_systemd(sd_bus **_bus); -// UNNEEDED int bus_open_user_systemd(sd_bus **_bus); +/// UNNEEDED by elogind +#if 0 +int bus_open_system_systemd(sd_bus **_bus); +int bus_open_user_systemd(sd_bus **_bus); +#endif // 0 int bus_connect_transport(BusTransport transport, const char *host, bool user, sd_bus **bus); -// UNNEEDED bus_connect_transport_systemd(BusTransport transport, const char *host, bool user, sd_bus **bus); +/// UNNEEDED by elogind +#if 0 +bus_connect_transport_systemd(BusTransport transport, const char *host, bool user, sd_bus **bus); +#endif // 0 int bus_print_property(const char *name, sd_bus_message *property, bool all); int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, char **filter, bool all); @@ -119,7 +137,7 @@ assert_cc(sizeof(mode_t) == sizeof(uint32_t)); #define bus_property_get_mode ((sd_bus_property_get_t) NULL) int bus_log_parse_error(int r); -// UNNEEDED int bus_log_create_error(int r); +int bus_log_create_error(int r); /// UNNEEDED by elogind #if 0 @@ -136,9 +154,9 @@ typedef struct UnitInfo { const char *job_type; const char *job_path; } UnitInfo; -#endif // 0 -// UNNEEDED int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u); +int bus_parse_unit_info(sd_bus_message *message, UnitInfo *u); +#endif // 0 DEFINE_TRIVIAL_CLEANUP_FUNC(sd_bus*, sd_bus_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(sd_bus*, sd_bus_flush_close_unref); @@ -186,24 +204,30 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(sd_bus_track*, sd_bus_track_unref); SD_BUS_PROPERTY(name, "t", bus_property_get_usec, (offset) + offsetof(struct dual_timestamp, realtime), (flags)), \ SD_BUS_PROPERTY(name "Monotonic", "t", bus_property_get_usec, (offset) + offsetof(struct dual_timestamp, monotonic), (flags)) -// UNNEEDED int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignment); +/// UNNEEDED by elogind +#if 0 +int bus_append_unit_property_assignment(sd_bus_message *m, const char *assignment); -// UNNEEDED typedef struct BusWaitForJobs BusWaitForJobs; +typedef struct BusWaitForJobs BusWaitForJobs; -// UNNEEDED int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret); -// UNNEEDED void bus_wait_for_jobs_free(BusWaitForJobs *d); -// UNNEEDED int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path); -// UNNEEDED int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet); -// UNNEEDED int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet); +int bus_wait_for_jobs_new(sd_bus *bus, BusWaitForJobs **ret); +void bus_wait_for_jobs_free(BusWaitForJobs *d); +int bus_wait_for_jobs_add(BusWaitForJobs *d, const char *path); +int bus_wait_for_jobs(BusWaitForJobs *d, bool quiet); +int bus_wait_for_jobs_one(BusWaitForJobs *d, const char *path, bool quiet); -// UNNEEDED DEFINE_TRIVIAL_CLEANUP_FUNC(BusWaitForJobs*, bus_wait_for_jobs_free); +DEFINE_TRIVIAL_CLEANUP_FUNC(BusWaitForJobs*, bus_wait_for_jobs_free); -// UNNEEDED int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, UnitFileChange **changes, unsigned *n_changes); +int bus_deserialize_and_dump_unit_file_changes(sd_bus_message *m, bool quiet, UnitFileChange **changes, unsigned *n_changes); -// UNNEEDED int bus_path_encode_unique(sd_bus *b, const char *prefix, const char *sender_id, const char *external_id, char **ret_path); -// UNNEEDED int bus_path_decode_unique(const char *path, const char *prefix, char **ret_sender, char **ret_external); +int bus_path_encode_unique(sd_bus *b, const char *prefix, const char *sender_id, const char *external_id, char **ret_path); +int bus_path_decode_unique(const char *path, const char *prefix, char **ret_sender, char **ret_external); +#endif // 0 bool is_kdbus_wanted(void); bool is_kdbus_available(void); -// UNNEEDED int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error); +/// UNNEEDED by elogind +#if 0 +int bus_property_get_rlimit(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error); +#endif // 0 diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c index 579cf843b..0899509d7 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c @@ -459,7 +459,10 @@ DEFINE_PARSER(uint32, uint32_t, safe_atou32); DEFINE_PARSER(uint64, uint64_t, safe_atou64); DEFINE_PARSER(unsigned, unsigned, safe_atou); DEFINE_PARSER(double, double, safe_atod); -// UNNEEDED DEFINE_PARSER(nsec, nsec_t, parse_nsec); +/// UNNEEDED by elogind +#if 0 +DEFINE_PARSER(nsec, nsec_t, parse_nsec); +#endif // 0 DEFINE_PARSER(sec, usec_t, parse_sec); DEFINE_PARSER(mode, mode_t, parse_mode); diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h index f2dde26ba..23cdc7293 100644 --- a/src/shared/conf-parser.h +++ b/src/shared/conf-parser.h @@ -108,20 +108,35 @@ int config_parse_uint32(const char *unit, const char *filename, unsigned line, c int config_parse_uint64(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_double(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_iec_size(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -// UNNEEDED int config_parse_si_size(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -// UNNEEDED int config_parse_iec_off(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +/// UNNEEDED by elogind +#if 0 +int config_parse_si_size(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +int config_parse_iec_off(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +#endif // 0 int config_parse_bool(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -// UNNEEDED int config_parse_tristate(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +/// UNNEEDED by elogind +#if 0 +int config_parse_tristate(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +#endif // 0 int config_parse_string(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_path(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_strv(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_sec(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -// UNNEEDED int config_parse_nsec(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +/// UNNEEDED by elogind +#if 0 +int config_parse_nsec(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +#endif // 0 int config_parse_mode(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -// UNNEEDED int config_parse_log_facility(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +/// UNNEEDED by elogind +#if 0 +int config_parse_log_facility(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +#endif // 0 int config_parse_log_level(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); int config_parse_signal(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); -// UNNEEDED int config_parse_personality(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +/// UNNEEDED by elogind +#if 0 +int config_parse_personality(const char *unit, const char *filename, unsigned line, const char *section, unsigned section_line, const char *lvalue, int ltype, const char *rvalue, void *data, void *userdata); +#endif // 0 #define DEFINE_CONFIG_PARSE_ENUM(function,name,type,msg) \ int function(const char *unit, \ diff --git a/src/shared/pager.h b/src/shared/pager.h index 6eb1f439f..03bdf82a6 100644 --- a/src/shared/pager.h +++ b/src/shared/pager.h @@ -29,4 +29,7 @@ int pager_open(bool jump_to_end); void pager_close(void); bool pager_have(void) _pure_; -// UNNEEDED int show_man_page(const char *page, bool null_stdio); +/// UNNEEDED by elogind +#if 0 +int show_man_page(const char *page, bool null_stdio); +#endif // 0 diff --git a/src/shared/udev-util.h b/src/shared/udev-util.h index 98ccdb1dc..4153b5b2d 100644 --- a/src/shared/udev-util.h +++ b/src/shared/udev-util.h @@ -27,20 +27,26 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev*, udev_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_device*, udev_device_unref); DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_enumerate*, udev_enumerate_unref); -// UNNEEDED DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_event*, udev_event_unref); -// UNNEEDED DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_rules*, udev_rules_unref); -// UNNEEDED DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl*, udev_ctrl_unref); -// UNNEEDED DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_connection*, udev_ctrl_connection_unref); -// UNNEEDED DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_msg*, udev_ctrl_msg_unref); +/// UNNEEDED by elogind +#if 0 +DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_event*, udev_event_unref); +DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_rules*, udev_rules_unref); +DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl*, udev_ctrl_unref); +DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_connection*, udev_ctrl_connection_unref); +DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_ctrl_msg*, udev_ctrl_msg_unref); +#endif // 0 DEFINE_TRIVIAL_CLEANUP_FUNC(struct udev_monitor*, udev_monitor_unref); #define _cleanup_udev_unref_ _cleanup_(udev_unrefp) #define _cleanup_udev_device_unref_ _cleanup_(udev_device_unrefp) #define _cleanup_udev_enumerate_unref_ _cleanup_(udev_enumerate_unrefp) -// UNNEEDED #define _cleanup_udev_event_unref_ _cleanup_(udev_event_unrefp) -// UNNEEDED #define _cleanup_udev_rules_unref_ _cleanup_(udev_rules_unrefp) -// UNNEEDED #define _cleanup_udev_ctrl_unref_ _cleanup_(udev_ctrl_unrefp) -// UNNEEDED #define _cleanup_udev_ctrl_connection_unref_ _cleanup_(udev_ctrl_connection_unrefp) -// UNNEEDED #define _cleanup_udev_ctrl_msg_unref_ _cleanup_(udev_ctrl_msg_unrefp) +/// UNNEEDED by elogind +#if 0 +#define _cleanup_udev_event_unref_ _cleanup_(udev_event_unrefp) +#define _cleanup_udev_rules_unref_ _cleanup_(udev_rules_unrefp) +#define _cleanup_udev_ctrl_unref_ _cleanup_(udev_ctrl_unrefp) +#define _cleanup_udev_ctrl_connection_unref_ _cleanup_(udev_ctrl_connection_unrefp) +#define _cleanup_udev_ctrl_msg_unref_ _cleanup_(udev_ctrl_msg_unrefp) +#endif // 0 #define _cleanup_udev_monitor_unref_ _cleanup_(udev_monitor_unrefp) #define _cleanup_udev_list_cleanup_ _cleanup_(udev_list_cleanup) diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h index b2f2b6ace..57f9bc80f 100644 --- a/src/systemd/sd-bus.h +++ b/src/systemd/sd-bus.h @@ -127,58 +127,82 @@ int sd_bus_new(sd_bus **ret); int sd_bus_set_address(sd_bus *bus, const char *address); int sd_bus_set_fd(sd_bus *bus, int input_fd, int output_fd); -// UNNEEDED int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]); -// 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); -// 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); -// UNNEEDED int sd_bus_set_trusted(sd_bus *bus, int b); -// UNNEEDED int sd_bus_is_trusted(sd_bus *bus); -// UNNEEDED int sd_bus_set_monitor(sd_bus *bus, int b); -// 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); -// 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); +/// UNNEEDED by elogind +#if 0 +int sd_bus_set_exec(sd_bus *bus, const char *path, char *const argv[]); +int sd_bus_get_address(sd_bus *bus, const char **address); +int sd_bus_set_bus_client(sd_bus *bus, int b); +int sd_bus_is_bus_client(sd_bus *bus); +int sd_bus_set_server(sd_bus *bus, int b, sd_id128_t bus_id); +int sd_bus_is_server(sd_bus *bus); +int sd_bus_set_anonymous(sd_bus *bus, int b); +int sd_bus_is_anonymous(sd_bus *bus); +int sd_bus_set_trusted(sd_bus *bus, int b); +int sd_bus_is_trusted(sd_bus *bus); +int sd_bus_set_monitor(sd_bus *bus, int b); +int sd_bus_is_monitor(sd_bus *bus); +int sd_bus_set_description(sd_bus *bus, const char *description); +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); +int sd_bus_negotiate_timestamp(sd_bus *bus, int b); +int sd_bus_negotiate_fds(sd_bus *bus, int b); +#endif // 0 int sd_bus_can_send(sd_bus *bus, char type); -// UNNEEDED int sd_bus_get_creds_mask(sd_bus *bus, uint64_t *creds_mask); +/// UNNEEDED by elogind +#if 0 +int sd_bus_get_creds_mask(sd_bus *bus, uint64_t *creds_mask); +#endif // 0 int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b); -// UNNEEDED int sd_bus_get_allow_interactive_authorization(sd_bus *bus); +/// UNNEEDED by elogind +#if 0 +int sd_bus_get_allow_interactive_authorization(sd_bus *bus); +#endif // 0 int sd_bus_start(sd_bus *ret); -// UNNEEDED int sd_bus_try_close(sd_bus *bus); +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); -// UNNEEDED void sd_bus_default_flush_close(void); +/// UNNEEDED by elogind +#if 0 +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); -// UNNEEDED int sd_bus_get_tid(sd_bus *bus, pid_t *tid); +int sd_bus_get_bus_id(sd_bus *bus, sd_id128_t *id); +int sd_bus_get_scope(sd_bus *bus, const char **scope); +int sd_bus_get_tid(sd_bus *bus, pid_t *tid); +#endif // 0 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); -// UNNEEDED int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie); +/// UNNEEDED by elogind +#if 0 +int sd_bus_send_to(sd_bus *bus, sd_bus_message *m, const char *destination, uint64_t *cookie); +#endif // 0 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); -// UNNEEDED int sd_bus_get_fd(sd_bus *bus); +/// UNNEEDED by elogind +#if 0 +int sd_bus_get_fd(sd_bus *bus); +#endif // 0 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); -// UNNEEDED int sd_bus_process_priority(sd_bus *bus, int64_t max_priority, sd_bus_message **r); +/// UNNEEDED by elogind +#if 0 +int sd_bus_process_priority(sd_bus *bus, int64_t max_priority, sd_bus_message **r); +#endif // 0 int sd_bus_wait(sd_bus *bus, uint64_t timeout_usec); int sd_bus_flush(sd_bus *bus); -// UNNEEDED sd_bus_slot* sd_bus_get_current_slot(sd_bus *bus); +/// UNNEEDED by elogind +#if 0 +sd_bus_slot* sd_bus_get_current_slot(sd_bus *bus); +#endif // 0 sd_bus_message* sd_bus_get_current_message(sd_bus *bus); sd_bus_message_handler_t sd_bus_get_current_handler(sd_bus *bus); void* sd_bus_get_current_userdata(sd_bus *bus); @@ -187,29 +211,38 @@ 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); -// UNNEEDED int sd_bus_add_filter(sd_bus *bus, sd_bus_slot **slot, sd_bus_message_handler_t callback, void *userdata); +/// UNNEEDED by elogind +#if 0 +int sd_bus_add_filter(sd_bus *bus, sd_bus_slot **slot, sd_bus_message_handler_t callback, void *userdata); +#endif // 0 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); int sd_bus_add_object_vtable(sd_bus *bus, sd_bus_slot **slot, const char *path, const char *interface, const sd_bus_vtable *vtable, void *userdata); int sd_bus_add_fallback_vtable(sd_bus *bus, sd_bus_slot **slot, const char *prefix, const char *interface, const sd_bus_vtable *vtable, sd_bus_object_find_t find, void *userdata); int sd_bus_add_node_enumerator(sd_bus *bus, sd_bus_slot **slot, const char *path, sd_bus_node_enumerator_t callback, void *userdata); -// UNNEEDED int sd_bus_add_object_manager(sd_bus *bus, sd_bus_slot **slot, const char *path); +/// UNNEEDED by elogind +#if 0 +int sd_bus_add_object_manager(sd_bus *bus, sd_bus_slot **slot, const char *path); +#endif // 0 /* Slot object */ sd_bus_slot* sd_bus_slot_ref(sd_bus_slot *slot); sd_bus_slot* sd_bus_slot_unref(sd_bus_slot *slot); -// UNNEEDED sd_bus* sd_bus_slot_get_bus(sd_bus_slot *slot); -// UNNEEDED void *sd_bus_slot_get_userdata(sd_bus_slot *slot); -// UNNEEDED void *sd_bus_slot_set_userdata(sd_bus_slot *slot, void *userdata); -// UNNEEDED int sd_bus_slot_set_description(sd_bus_slot *slot, const char *description); -// UNNEEDED int sd_bus_slot_get_description(sd_bus_slot *slot, const char **description); +/// UNNEEDED by elogind +#if 0 +sd_bus* sd_bus_slot_get_bus(sd_bus_slot *slot); +void *sd_bus_slot_get_userdata(sd_bus_slot *slot); +void *sd_bus_slot_set_userdata(sd_bus_slot *slot, void *userdata); +int sd_bus_slot_set_description(sd_bus_slot *slot, const char *description); +int sd_bus_slot_get_description(sd_bus_slot *slot, const char **description); -// UNNEEDED sd_bus_message* sd_bus_slot_get_current_message(sd_bus_slot *slot); -// UNNEEDED sd_bus_message_handler_t sd_bus_slot_get_current_handler(sd_bus_slot *bus); -// UNNEEDED void *sd_bus_slot_get_current_userdata(sd_bus_slot *slot); +sd_bus_message* sd_bus_slot_get_current_message(sd_bus_slot *slot); +sd_bus_message_handler_t sd_bus_slot_get_current_handler(sd_bus_slot *bus); +void *sd_bus_slot_get_current_userdata(sd_bus_slot *slot); +#endif // 0 /* Message object */ @@ -219,18 +252,25 @@ int sd_bus_message_new_method_return(sd_bus_message *call, sd_bus_message **m); int sd_bus_message_new_method_error(sd_bus_message *call, sd_bus_message **m, const sd_bus_error *e); int sd_bus_message_new_method_errorf(sd_bus_message *call, sd_bus_message **m, const char *name, const char *format, ...) _sd_printf_(4, 5); int sd_bus_message_new_method_errno(sd_bus_message *call, sd_bus_message **m, int error, const sd_bus_error *e); -// UNNEEDED int sd_bus_message_new_method_errnof(sd_bus_message *call, sd_bus_message **m, int error, const char *format, ...) _sd_printf_(4, 5); +/// UNNEEDED by elogind +#if 0 +int sd_bus_message_new_method_errnof(sd_bus_message *call, sd_bus_message **m, int error, const char *format, ...) _sd_printf_(4, 5); +#endif // 0 sd_bus_message* sd_bus_message_ref(sd_bus_message *m); sd_bus_message* sd_bus_message_unref(sd_bus_message *m); -// UNNEEDED int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type); -// UNNEEDED int sd_bus_message_get_cookie(sd_bus_message *m, uint64_t *cookie); -// UNNEEDED int sd_bus_message_get_reply_cookie(sd_bus_message *m, uint64_t *cookie); -// UNNEEDED int sd_bus_message_get_priority(sd_bus_message *m, int64_t *priority); +/// UNNEEDED by elogind +#if 0 +int sd_bus_message_get_type(sd_bus_message *m, uint8_t *type); +int sd_bus_message_get_cookie(sd_bus_message *m, uint64_t *cookie); +int sd_bus_message_get_reply_cookie(sd_bus_message *m, uint64_t *cookie); +int sd_bus_message_get_priority(sd_bus_message *m, int64_t *priority); + +int sd_bus_message_get_expect_reply(sd_bus_message *m); +int sd_bus_message_get_auto_start(sd_bus_message *m); +#endif // 0 -// UNNEEDED int sd_bus_message_get_expect_reply(sd_bus_message *m); -// UNNEEDED int sd_bus_message_get_auto_start(sd_bus_message *m); int sd_bus_message_get_allow_interactive_authorization(sd_bus_message *m); const char *sd_bus_message_get_signature(sd_bus_message *m, int complete); @@ -242,35 +282,50 @@ const char *sd_bus_message_get_sender(sd_bus_message *m); const sd_bus_error *sd_bus_message_get_error(sd_bus_message *m); int sd_bus_message_get_errno(sd_bus_message *m); -// UNNEEDED int sd_bus_message_get_monotonic_usec(sd_bus_message *m, uint64_t *usec); -// UNNEEDED int sd_bus_message_get_realtime_usec(sd_bus_message *m, uint64_t *usec); -// UNNEEDED int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t* seqnum); +/// UNNEEDED by elogind +#if 0 +int sd_bus_message_get_monotonic_usec(sd_bus_message *m, uint64_t *usec); +int sd_bus_message_get_realtime_usec(sd_bus_message *m, uint64_t *usec); +int sd_bus_message_get_seqnum(sd_bus_message *m, uint64_t* seqnum); +#endif // 0 sd_bus* sd_bus_message_get_bus(sd_bus_message *m); sd_bus_creds *sd_bus_message_get_creds(sd_bus_message *m); /* do not unref the result */ -// UNNEEDED int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member); +/// UNNEEDED by elogind +#if 0 +int sd_bus_message_is_signal(sd_bus_message *m, const char *interface, const char *member); +#endif // 0 int sd_bus_message_is_method_call(sd_bus_message *m, const char *interface, const char *member); int sd_bus_message_is_method_error(sd_bus_message *m, const char *name); -// UNNEEDED int sd_bus_message_is_empty(sd_bus_message *m); -// UNNEEDED int sd_bus_message_has_signature(sd_bus_message *m, const char *signature); +/// UNNEEDED by elogind +#if 0 +int sd_bus_message_is_empty(sd_bus_message *m); +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); -// 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_expect_reply(sd_bus_message *m, int b); +int sd_bus_message_set_auto_start(sd_bus_message *m, int b); +int sd_bus_message_set_allow_interactive_authorization(sd_bus_message *m, int b); +#endif // 0 int sd_bus_message_set_destination(sd_bus_message *m, const char *destination); -// UNNEEDED int sd_bus_message_set_priority(sd_bus_message *m, int64_t priority); +/// UNNEEDED by elogind +#if 0 +int sd_bus_message_set_priority(sd_bus_message *m, int64_t priority); +#endif // 0 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); -// 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); -// 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); +/// UNNEEDED by elogind +#if 0 +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); +int sd_bus_message_append_array_iovec(sd_bus_message *m, char type, const struct iovec *iov, unsigned n); +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); +int sd_bus_message_append_string_iovec(sd_bus_message *m, const struct iovec *iov, unsigned n); +int sd_bus_message_append_string_memfd(sd_bus_message *m, int memfd, uint64_t offset, uint64_t size); +#endif // 0 int sd_bus_message_append_strv(sd_bus_message *m, char **l); int sd_bus_message_open_container(sd_bus_message *m, char type, const char *contents); int sd_bus_message_close_container(sd_bus_message *m); @@ -284,8 +339,11 @@ int sd_bus_message_skip(sd_bus_message *m, const char *types); int sd_bus_message_enter_container(sd_bus_message *m, char type, const char *contents); int sd_bus_message_exit_container(sd_bus_message *m); int sd_bus_message_peek_type(sd_bus_message *m, char *type, const char **contents); -// UNNEEDED int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents); -// UNNEEDED int sd_bus_message_at_end(sd_bus_message *m, int complete); +/// UNNEEDED by elogind +#if 0 +int sd_bus_message_verify_type(sd_bus_message *m, char type, const char *contents); +int sd_bus_message_at_end(sd_bus_message *m, int complete); +#endif // 0 int sd_bus_message_rewind(sd_bus_message *m, int complete); /* Bus management */ @@ -295,23 +353,37 @@ int sd_bus_request_name(sd_bus *bus, const char *name, uint64_t flags); int sd_bus_release_name(sd_bus *bus, const char *name); int sd_bus_list_names(sd_bus *bus, char ***acquired, char ***activatable); /* free the results */ int sd_bus_get_name_creds(sd_bus *bus, const char *name, uint64_t mask, sd_bus_creds **creds); /* unref the result! */ -// UNNEEDED int sd_bus_get_name_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine); - +/// UNNEEDED by elogind +#if 0 +int sd_bus_get_name_machine_id(sd_bus *bus, const char *name, sd_id128_t *machine); +#endif // 0 /* Convenience calls */ int sd_bus_call_method(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, sd_bus_message **reply, const char *types, ...); -// UNNEEDED int sd_bus_call_method_async(sd_bus *bus, sd_bus_slot **slot, const char *destination, const char *path, const char *interface, const char *member, sd_bus_message_handler_t callback, void *userdata, const char *types, ...); +/// UNNEEDED by elogind +#if 0 +int sd_bus_call_method_async(sd_bus *bus, sd_bus_slot **slot, const char *destination, const char *path, const char *interface, const char *member, sd_bus_message_handler_t callback, void *userdata, const char *types, ...); +#endif // 0 int sd_bus_get_property(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, sd_bus_message **reply, const char *type); -// UNNEEDED int sd_bus_get_property_trivial(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char type, void *ret_ptr); +/// UNNEEDED by elogind +#if 0 +int sd_bus_get_property_trivial(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char type, void *ret_ptr); +#endif // 0 int sd_bus_get_property_string(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char **ret); /* free the result! */ -// UNNEEDED int sd_bus_get_property_strv(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char ***ret); /* free the result! */ -// UNNEEDED int sd_bus_set_property(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, const char *type, ...); +/// UNNEEDED by elogind +#if 0 +int sd_bus_get_property_strv(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, char ***ret); /* free the result! */ +int sd_bus_set_property(sd_bus *bus, const char *destination, const char *path, const char *interface, const char *member, sd_bus_error *ret_error, const char *type, ...); +#endif // 0 int sd_bus_reply_method_return(sd_bus_message *call, const char *types, ...); int sd_bus_reply_method_error(sd_bus_message *call, const sd_bus_error *e); int sd_bus_reply_method_errorf(sd_bus_message *call, const char *name, const char *format, ...) _sd_printf_(3, 4); int sd_bus_reply_method_errno(sd_bus_message *call, int error, const sd_bus_error *e); -// UNNEEDED int sd_bus_reply_method_errnof(sd_bus_message *call, int error, const char *format, ...) _sd_printf_(3, 4); +/// UNNEEDED by elogind +#if 0 +int sd_bus_reply_method_errnof(sd_bus_message *call, int error, const char *format, ...) _sd_printf_(3, 4); +#endif // 0 int sd_bus_emit_signal(sd_bus *bus, const char *path, const char *interface, const char *member, const char *types, ...); @@ -319,7 +391,10 @@ int sd_bus_emit_properties_changed_strv(sd_bus *bus, const char *path, const cha int sd_bus_emit_properties_changed(sd_bus *bus, const char *path, const char *interface, const char *name, ...) _sd_sentinel_; int sd_bus_emit_object_added(sd_bus *bus, const char *path); -// UNNEEDED int sd_bus_emit_object_removed(sd_bus *bus, const char *path); +/// UNNEEDED by elogind +#if 0 +int sd_bus_emit_object_removed(sd_bus *bus, const char *path); +#endif // 0 int sd_bus_emit_interfaces_added_strv(sd_bus *bus, const char *path, char **interfaces); int sd_bus_emit_interfaces_added(sd_bus *bus, const char *path, const char *interface, ...) _sd_sentinel_; int sd_bus_emit_interfaces_removed_strv(sd_bus *bus, const char *path, char **interfaces); @@ -330,46 +405,70 @@ int sd_bus_query_sender_privilege(sd_bus_message *call, int capability); /* Credential handling */ -// UNNEEDED int sd_bus_creds_new_from_pid(sd_bus_creds **ret, pid_t pid, uint64_t creds_mask); +/// UNNEEDED by elogind +#if 0 +int sd_bus_creds_new_from_pid(sd_bus_creds **ret, pid_t pid, uint64_t creds_mask); +#endif // 0 sd_bus_creds *sd_bus_creds_ref(sd_bus_creds *c); sd_bus_creds *sd_bus_creds_unref(sd_bus_creds *c); -// UNNEEDED uint64_t sd_bus_creds_get_mask(const sd_bus_creds *c); +/// UNNEEDED by elogind +#if 0 +uint64_t sd_bus_creds_get_mask(const sd_bus_creds *c); +#endif // 0 uint64_t sd_bus_creds_get_augmented_mask(const sd_bus_creds *c); int sd_bus_creds_get_pid(sd_bus_creds *c, pid_t *pid); -// UNNEEDED int sd_bus_creds_get_ppid(sd_bus_creds *c, pid_t *ppid); +/// UNNEEDED by elogind +#if 0 +int sd_bus_creds_get_ppid(sd_bus_creds *c, pid_t *ppid); +#endif // 0 int sd_bus_creds_get_tid(sd_bus_creds *c, pid_t *tid); int sd_bus_creds_get_uid(sd_bus_creds *c, uid_t *uid); int sd_bus_creds_get_euid(sd_bus_creds *c, uid_t *euid); -// UNNEEDED int sd_bus_creds_get_suid(sd_bus_creds *c, uid_t *suid); -// UNNEEDED int sd_bus_creds_get_fsuid(sd_bus_creds *c, uid_t *fsuid); -// UNNEEDED int sd_bus_creds_get_gid(sd_bus_creds *c, gid_t *gid); +/// UNNEEDED by elogind +#if 0 +int sd_bus_creds_get_suid(sd_bus_creds *c, uid_t *suid); +int sd_bus_creds_get_fsuid(sd_bus_creds *c, uid_t *fsuid); +int sd_bus_creds_get_gid(sd_bus_creds *c, gid_t *gid); +#endif // 0 int sd_bus_creds_get_egid(sd_bus_creds *c, gid_t *egid); -// UNNEEDED int sd_bus_creds_get_sgid(sd_bus_creds *c, gid_t *sgid); -// UNNEEDED int sd_bus_creds_get_fsgid(sd_bus_creds *c, gid_t *fsgid); -// UNNEEDED int sd_bus_creds_get_supplementary_gids(sd_bus_creds *c, const gid_t **gids); -// UNNEEDED int sd_bus_creds_get_comm(sd_bus_creds *c, const char **comm); -// UNNEEDED int sd_bus_creds_get_tid_comm(sd_bus_creds *c, const char **comm); -// UNNEEDED int sd_bus_creds_get_exe(sd_bus_creds *c, const char **exe); +/// UNNEEDED by elogind +#if 0 +int sd_bus_creds_get_sgid(sd_bus_creds *c, gid_t *sgid); +int sd_bus_creds_get_fsgid(sd_bus_creds *c, gid_t *fsgid); +int sd_bus_creds_get_supplementary_gids(sd_bus_creds *c, const gid_t **gids); +int sd_bus_creds_get_comm(sd_bus_creds *c, const char **comm); +int sd_bus_creds_get_tid_comm(sd_bus_creds *c, const char **comm); +int sd_bus_creds_get_exe(sd_bus_creds *c, const char **exe); +#endif // 0 int sd_bus_creds_get_cmdline(sd_bus_creds *c, char ***cmdline); -// UNNEEDED int sd_bus_creds_get_cgroup(sd_bus_creds *c, const char **cgroup); -// UNNEEDED int sd_bus_creds_get_unit(sd_bus_creds *c, const char **unit); -// UNNEEDED int sd_bus_creds_get_slice(sd_bus_creds *c, const char **slice); -// UNNEEDED int sd_bus_creds_get_user_unit(sd_bus_creds *c, const char **unit); -// UNNEEDED int sd_bus_creds_get_user_slice(sd_bus_creds *c, const char **slice); +/// UNNEEDED by elogind +#if 0 +int sd_bus_creds_get_cgroup(sd_bus_creds *c, const char **cgroup); +int sd_bus_creds_get_unit(sd_bus_creds *c, const char **unit); +int sd_bus_creds_get_slice(sd_bus_creds *c, const char **slice); +int sd_bus_creds_get_user_unit(sd_bus_creds *c, const char **unit); +int sd_bus_creds_get_user_slice(sd_bus_creds *c, const char **slice); +#endif // 0 int sd_bus_creds_get_session(sd_bus_creds *c, const char **session); int sd_bus_creds_get_owner_uid(sd_bus_creds *c, uid_t *uid); int sd_bus_creds_has_effective_cap(sd_bus_creds *c, int capability); -// UNNEEDED int sd_bus_creds_has_permitted_cap(sd_bus_creds *c, int capability); -// UNNEEDED int sd_bus_creds_has_inheritable_cap(sd_bus_creds *c, int capability); -// UNNEEDED int sd_bus_creds_has_bounding_cap(sd_bus_creds *c, int capability); +/// UNNEEDED by elogind +#if 0 +int sd_bus_creds_has_permitted_cap(sd_bus_creds *c, int capability); +int sd_bus_creds_has_inheritable_cap(sd_bus_creds *c, int capability); +int sd_bus_creds_has_bounding_cap(sd_bus_creds *c, int capability); +#endif // 0 int sd_bus_creds_get_selinux_context(sd_bus_creds *c, const char **context); int sd_bus_creds_get_audit_session_id(sd_bus_creds *c, uint32_t *sessionid); int sd_bus_creds_get_audit_login_uid(sd_bus_creds *c, uid_t *loginuid); int sd_bus_creds_get_tty(sd_bus_creds *c, const char **tty); -// UNNEEDED int sd_bus_creds_get_unique_name(sd_bus_creds *c, const char **name); -// UNNEEDED int sd_bus_creds_get_well_known_names(sd_bus_creds *c, char ***names); -// UNNEEDED int sd_bus_creds_get_description(sd_bus_creds *c, const char **name); +/// UNNEEDED by elogind +#if 0 +int sd_bus_creds_get_unique_name(sd_bus_creds *c, const char **name); +int sd_bus_creds_get_well_known_names(sd_bus_creds *c, char ***names); +int sd_bus_creds_get_description(sd_bus_creds *c, const char **name); +#endif // 0 /* Error structures */ @@ -417,10 +516,13 @@ int sd_bus_error_add_map(const sd_bus_error_map *map); /* Label escaping */ -// UNNEEDED int sd_bus_path_encode(const char *prefix, const char *external_id, char **ret_path); -// UNNEEDED int sd_bus_path_encode_many(char **out, const char *path_template, ...); -// UNNEEDED int sd_bus_path_decode(const char *path, const char *prefix, char **ret_external_id); -// UNNEEDED int sd_bus_path_decode_many(const char *path, const char *path_template, ...); +/// UNNEEDED by elogind +#if 0 +int sd_bus_path_encode(const char *prefix, const char *external_id, char **ret_path); +int sd_bus_path_encode_many(char **out, const char *path_template, ...); +int sd_bus_path_decode(const char *path, const char *prefix, char **ret_external_id); +int sd_bus_path_decode_many(const char *path, const char *path_template, ...); +#endif // 0 /* Tracking peers */ @@ -429,8 +531,11 @@ sd_bus_track* sd_bus_track_ref(sd_bus_track *track); sd_bus_track* sd_bus_track_unref(sd_bus_track *track); sd_bus* sd_bus_track_get_bus(sd_bus_track *track); -// UNNEEDED void *sd_bus_track_get_userdata(sd_bus_track *track); -// UNNEEDED void *sd_bus_track_set_userdata(sd_bus_track *track, void *userdata); +/// UNNEEDED by elogind +#if 0 +void *sd_bus_track_get_userdata(sd_bus_track *track); +void *sd_bus_track_set_userdata(sd_bus_track *track, void *userdata); +#endif // 0 int sd_bus_track_add_sender(sd_bus_track *track, sd_bus_message *m); int sd_bus_track_remove_sender(sd_bus_track *track, sd_bus_message *m); diff --git a/src/systemd/sd-daemon.h b/src/systemd/sd-daemon.h index 2d573fde9..3390deeca 100644 --- a/src/systemd/sd-daemon.h +++ b/src/systemd/sd-daemon.h @@ -59,6 +59,8 @@ _SD_BEGIN_DECLARATIONS; /* The first passed file descriptor is fd 3 */ #define SD_LISTEN_FDS_START 3 +/// UNNEEDED by elogind +#if 0 /* Returns how many file descriptors have been passed, or a negative errno code on failure. Optionally, removes the $LISTEN_FDS and @@ -74,9 +76,9 @@ _SD_BEGIN_DECLARATIONS; See sd_listen_fds(3) for more information. */ -// UNNEEDED int sd_listen_fds(int unset_environment); +int sd_listen_fds(int unset_environment); -// UNNEEDED int sd_listen_fds_with_names(int unset_environment, char ***names); +int sd_listen_fds_with_names(int unset_environment, char ***names); /* Helper call for identifying a passed file descriptor. Returns 1 if @@ -88,7 +90,7 @@ _SD_BEGIN_DECLARATIONS; See sd_is_fifo(3) for more information. */ -// UNNEEDED int sd_is_fifo(int fd, const char *path); +int sd_is_fifo(int fd, const char *path); /* Helper call for identifying a passed file descriptor. Returns 1 if @@ -100,7 +102,8 @@ _SD_BEGIN_DECLARATIONS; See sd_is_special(3) for more information. */ -// UNNEEDED int sd_is_special(int fd, const char *path); +int sd_is_special(int fd, const char *path); +#endif // 0 /* Helper call for identifying a passed file descriptor. Returns 1 if @@ -118,6 +121,8 @@ _SD_BEGIN_DECLARATIONS; */ int sd_is_socket(int fd, int family, int type, int listening); +/// UNNEEDED by elogind +#if 0 /* Helper call for identifying a passed file descriptor. Returns 1 if the file descriptor is an Internet socket, of the specified family @@ -130,7 +135,7 @@ int sd_is_socket(int fd, int family, int type, int listening); See sd_is_socket_inet(3) for more information. */ -// UNNEEDED int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port); +int sd_is_socket_inet(int fd, int family, int type, int listening, uint16_t port); /* Helper call for identifying a passed file descriptor. Returns 1 if @@ -146,7 +151,7 @@ int sd_is_socket(int fd, int family, int type, int listening); See sd_is_socket_unix(3) for more information. */ -// UNNEEDED int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length); +int sd_is_socket_unix(int fd, int type, int listening, const char *path, size_t length); /* Helper call for identifying a passed file descriptor. Returns 1 if @@ -156,7 +161,8 @@ int sd_is_socket(int fd, int family, int type, int listening); See sd_is_mq(3) for more information. */ -// UNNEEDED int sd_is_mq(int fd, const char *path); +int sd_is_mq(int fd, const char *path); +#endif // 0 /* Informs systemd about changed daemon state. This takes a number of @@ -216,6 +222,8 @@ int sd_is_socket(int fd, int family, int type, int listening); */ int sd_notify(int unset_environment, const char *state); +/// UNNEEDED by elogind +#if 0 /* Similar to sd_notify() but takes a format string. @@ -236,19 +244,20 @@ int sd_notify(int unset_environment, const char *state); See sd_notifyf(3) for more information. */ -// UNNEEDED int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_(2,3); +int sd_notifyf(int unset_environment, const char *format, ...) _sd_printf_(2,3); /* Similar to sd_notify(), but send the message on behalf of another process, if the appropriate permissions are available. */ -// UNNEEDED int sd_pid_notify(pid_t pid, int unset_environment, const char *state); +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 process, if the appropriate permissions are available. */ -// UNNEEDED int sd_pid_notifyf(pid_t pid, int unset_environment, const char *format, ...) _sd_printf_(3,4); +int sd_pid_notifyf(pid_t pid, int unset_environment, const char *format, ...) _sd_printf_(3,4); +#endif // 0 /* Similar to sd_pid_notify(), but also passes the specified fd array @@ -257,6 +266,8 @@ int sd_notify(int unset_environment, const char *state); */ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char *state, const int *fds, unsigned n_fds); +/// UNNEEDED by elogind +#if 0 /* Returns > 0 if the system was booted with systemd. Returns < 0 on error. Returns 0 if the system was not booted with systemd. Note @@ -268,7 +279,8 @@ int sd_pid_notify_with_fds(pid_t pid, int unset_environment, const char *state, See sd_booted(3) for more information. */ -// UNNEEDED int sd_booted(void); +int sd_booted(void); +#endif // 0 /* Returns > 0 if the service manager expects watchdog keep-alive diff --git a/src/systemd/sd-event.h b/src/systemd/sd-event.h index 1adb26ee4..e8a4154d3 100644 --- a/src/systemd/sd-event.h +++ b/src/systemd/sd-event.h @@ -81,8 +81,11 @@ 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); -// 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); +/// UNNEEDED by elogind +#if 0 +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); +#endif // 0 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); @@ -90,45 +93,81 @@ int sd_event_prepare(sd_event *e); int sd_event_wait(sd_event *e, uint64_t timeout); int sd_event_dispatch(sd_event *e); int sd_event_run(sd_event *e, uint64_t timeout); -// UNNEEDED int sd_event_loop(sd_event *e); +/// UNNEEDED by elogind +#if 0 +int sd_event_loop(sd_event *e); +#endif // 0 int sd_event_exit(sd_event *e, int code); -// UNNEEDED int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec); +/// UNNEEDED by elogind +#if 0 +int sd_event_now(sd_event *e, clockid_t clock, uint64_t *usec); -// UNNEEDED int sd_event_get_fd(sd_event *e); +int sd_event_get_fd(sd_event *e); +#endif // 0 int sd_event_get_state(sd_event *e); -// UNNEEDED int sd_event_get_tid(sd_event *e, pid_t *tid); -// UNNEEDED int sd_event_get_exit_code(sd_event *e, int *code); +/// UNNEEDED by elogind +#if 0 +int sd_event_get_tid(sd_event *e, pid_t *tid); +int sd_event_get_exit_code(sd_event *e, int *code); +#endif // 0 int sd_event_set_watchdog(sd_event *e, int b); -// UNNEEDED int sd_event_get_watchdog(sd_event *e); +/// UNNEEDED by elogind +#if 0 +int sd_event_get_watchdog(sd_event *e); -// UNNEEDED sd_event_source* sd_event_source_ref(sd_event_source *s); +sd_event_source* sd_event_source_ref(sd_event_source *s); +#endif // 0 sd_event_source* sd_event_source_unref(sd_event_source *s); sd_event *sd_event_source_get_event(sd_event_source *s); -// UNNEEDED void* sd_event_source_get_userdata(sd_event_source *s); -// UNNEEDED void* sd_event_source_set_userdata(sd_event_source *s, void *userdata); +/// UNNEEDED by elogind +#if 0 +void* sd_event_source_get_userdata(sd_event_source *s); +void* sd_event_source_set_userdata(sd_event_source *s, void *userdata); +#endif // 0 int sd_event_source_set_description(sd_event_source *s, const char *description); -// UNNEEDED int sd_event_source_get_description(sd_event_source *s, const char **description); +/// UNNEEDED by elogind +#if 0 +int sd_event_source_get_description(sd_event_source *s, const char **description); +#endif // 0 int sd_event_source_set_prepare(sd_event_source *s, sd_event_handler_t callback); -// UNNEEDED int sd_event_source_get_pending(sd_event_source *s); -// UNNEEDED int sd_event_source_get_priority(sd_event_source *s, int64_t *priority); +/// UNNEEDED by elogind +#if 0 +int sd_event_source_get_pending(sd_event_source *s); +int sd_event_source_get_priority(sd_event_source *s, int64_t *priority); +#endif // 0 int sd_event_source_set_priority(sd_event_source *s, int64_t priority); -// UNNEEDED int sd_event_source_get_enabled(sd_event_source *s, int *enabled); +/// UNNEEDED by elogind +#if 0 +int sd_event_source_get_enabled(sd_event_source *s, int *enabled); +#endif // 0 int sd_event_source_set_enabled(sd_event_source *s, int enabled); -// UNNEEDED int sd_event_source_get_io_fd(sd_event_source *s); +/// UNNEEDED by elogind +#if 0 +int sd_event_source_get_io_fd(sd_event_source *s); +#endif // 0 int sd_event_source_set_io_fd(sd_event_source *s, int fd); -// UNNEEDED int sd_event_source_get_io_events(sd_event_source *s, uint32_t* events); +/// UNNEEDED by elogind +#if 0 +int sd_event_source_get_io_events(sd_event_source *s, uint32_t* events); +#endif // 0 int sd_event_source_set_io_events(sd_event_source *s, uint32_t events); -// UNNEEDED int sd_event_source_get_io_revents(sd_event_source *s, uint32_t* revents); +/// UNNEEDED by elogind +#if 0 +int sd_event_source_get_io_revents(sd_event_source *s, uint32_t* revents); +#endif // 0 int sd_event_source_get_time(sd_event_source *s, uint64_t *usec); int sd_event_source_set_time(sd_event_source *s, uint64_t usec); -// UNNEEDED int sd_event_source_get_time_accuracy(sd_event_source *s, uint64_t *usec); -// UNNEEDED int sd_event_source_set_time_accuracy(sd_event_source *s, uint64_t usec); -// UNNEEDED int sd_event_source_get_time_clock(sd_event_source *s, clockid_t *clock); -// UNNEEDED int sd_event_source_get_signal(sd_event_source *s); -// UNNEEDED int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid); +/// UNNEEDED by elogind +#if 0 +int sd_event_source_get_time_accuracy(sd_event_source *s, uint64_t *usec); +int sd_event_source_set_time_accuracy(sd_event_source *s, uint64_t usec); +int sd_event_source_get_time_clock(sd_event_source *s, clockid_t *clock); +int sd_event_source_get_signal(sd_event_source *s); +int sd_event_source_get_child_pid(sd_event_source *s, pid_t *pid); +#endif // 0 _SD_END_DECLARATIONS; -- 2.30.2