Prep v232: Add libelogind.sym entries for version 232.

diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym
index 97b68623bc05a8a60c02f2771af5d93169f53c96..4d9623cbb7b294df103836f634e584971f21e0ff 100644 (file)
--- a/src/libelogind/libelogind.sym
+++ b/src/libelogind/libelogind.sym
@@ -7,7 +7,7 @@
   (at your option) any later version.
 ***/
 
   (at your option) any later version.
 ***/
 

-LIBSYSTEMD_209 {
+LIBELOGIND_209 {

 global:
         /* sd-journal */
         /* sd_journal_print; */
 global:
         /* sd-journal */
         /* sd_journal_print; */


@@ -126,7 +126,7 @@ local:
        *;
 };
 
        *;
 };
 

-LIBSYSTEMD_211 {
+LIBELOGIND_211 {

 global:
         sd_machine_get_class;
         sd_peer_get_session;
 global:
         sd_machine_get_class;
         sd_peer_get_session;


@@ -135,44 +135,44 @@ global:
         sd_peer_get_user_unit;
         sd_peer_get_machine_name;
         sd_peer_get_slice;
         sd_peer_get_user_unit;
         sd_peer_get_machine_name;
         sd_peer_get_slice;

-} LIBSYSTEMD_209;
+} LIBELOGIND_209;

 
 

-LIBSYSTEMD_213 {
+LIBELOGIND_213 {

 global:
         sd_uid_get_display;
 global:
         sd_uid_get_display;

-} LIBSYSTEMD_211;
+} LIBELOGIND_211;

 
 /*
  * These methods are not needed by elogind.
 
 /*
  * These methods are not needed by elogind.

- * LIBSYSTEMD_214 {
+ * LIBELOGIND_214 {

  * global:
  *         sd_pid_notify;
  *         sd_pid_notifyf;
  * global:
  *         sd_pid_notify;
  *         sd_pid_notifyf;

- * } LIBSYSTEMD_213;
+ * } LIBELOGIND_213;

  */
 
  */
 

-LIBSYSTEMD_216 {
+LIBELOGIND_216 {

 global:
         sd_machine_get_ifindices;
 global:
         sd_machine_get_ifindices;

-} LIBSYSTEMD_213;
+} LIBELOGIND_213;

 
 

-LIBSYSTEMD_217 {
+LIBELOGIND_217 {

 global:
         sd_session_get_desktop;
 global:
         sd_session_get_desktop;

-} LIBSYSTEMD_216;
+} LIBELOGIND_216;

 
 

-LIBSYSTEMD_219 {
+LIBELOGIND_219 {

 global:
         sd_pid_notify_with_fds;
 global:
         sd_pid_notify_with_fds;

-} LIBSYSTEMD_217;
+} LIBELOGIND_217;

 
 

-LIBSYSTEMD_220 {
+LIBELOGIND_220 {

 global:
         sd_pid_get_user_slice;
         sd_peer_get_user_slice;
 global:
         sd_pid_get_user_slice;
         sd_peer_get_user_slice;

-} LIBSYSTEMD_219;
+} LIBELOGIND_219;

 
 

-LIBSYSTEMD_221 {
+LIBELOGIND_221 {

 global:
         /* sd-bus */
         sd_bus_default;
 global:
         /* sd-bus */
         sd_bus_default;


@@ -461,54 +461,65 @@ global:
         /* sd_event_source_get_time_clock; */
         /* sd_event_source_get_signal; */
         /* sd_event_source_get_child_pid; */
         /* sd_event_source_get_time_clock; */
         /* sd_event_source_get_signal; */
         /* sd_event_source_get_child_pid; */

-} LIBSYSTEMD_220;
+} LIBELOGIND_220;

 
 

-LIBSYSTEMD_222 {
+LIBELOGIND_222 {

 global:
         /* sd-bus */
         sd_bus_emit_object_added;
         /* sd_bus_emit_object_removed; */
         sd_bus_flush_close_unref;
 global:
         /* sd-bus */
         sd_bus_emit_object_added;
         /* sd_bus_emit_object_removed; */
         sd_bus_flush_close_unref;

-} LIBSYSTEMD_221;
+} LIBELOGIND_221;

 
 

-LIBSYSTEMD_226 {
+LIBELOGIND_226 {

 global:
         sd_pid_get_cgroup;
         sd_peer_get_cgroup;
 global:
         sd_pid_get_cgroup;
         sd_peer_get_cgroup;

-} LIBSYSTEMD_222;
+} LIBELOGIND_222;

 
 /*
  * These methods are not needed by elogind.
 
 /*
  * These methods are not needed by elogind.

- * LIBSYSTEMD_227 {
+ * LIBELOGIND_227 {

  * global:
  *         sd_bus_default_flush_close;
  *         sd_bus_path_decode_many;
  *         sd_bus_path_encode_many;
  *         sd_listen_fds_with_names;
  * global:
  *         sd_bus_default_flush_close;
  *         sd_bus_path_decode_many;
  *         sd_bus_path_encode_many;
  *         sd_listen_fds_with_names;

- * } LIBSYSTEMD_226;
+ * } LIBELOGIND_226;

 */
 
 /*
  * These methods are not needed by elogind.
 */
 
 /*
  * These methods are not needed by elogind.

- * LIBSYSTEMD_229 {
+ * LIBELOGIND_229 {

  * global:
  *         sd_journal_has_runtime_files;
  *         sd_journal_has_persistent_files;
  *         sd_journal_enumerate_fields;
  *         sd_journal_restart_fields;
  * global:
  *         sd_journal_has_runtime_files;
  *         sd_journal_has_persistent_files;
  *         sd_journal_enumerate_fields;
  *         sd_journal_restart_fields;

- * } LIBSYSTEMD_227;
+ * } LIBELOGIND_227;

 */
 
 /*
  * These methods are not needed by elogind.
 */
 
 /*
  * These methods are not needed by elogind.

- * LIBSYSTEMD_230 {
+ * LIBELOGIND_230 {

  * global:
  *         sd_journal_open_directory_fd;
  *         sd_journal_open_files_fd;
  * global:
  *         sd_journal_open_directory_fd;
  *         sd_journal_open_files_fd;

- * } LIBSYSTEMD_229;
+ * } LIBELOGIND_229;

 */
 
 */
 

-LIBSYSTEMD_231 {
+LIBELOGIND_231 {

 global:
         sd_event_get_iteration;
 global:
         sd_event_get_iteration;

-} LIBSYSTEMD_226;
+} LIBELOGIND_226;
+
+LIBELOGIND_232 {
+global:
+        /* sd_bus_track_set_recursive; */
+        /* sd_bus_track_get_recursive; */
+        /* sd_bus_track_count_name; */
+        /* sd_bus_track_count_sender; */
+        sd_bus_set_exit_on_disconnect;
+        /* sd_bus_get_exit_on_disconnect; */
+        /* sd_id128_get_invocation; */
+} LIBELOGIND_231;

diff --git a/src/libelogind/sd-bus/bus-track.c b/src/libelogind/sd-bus/bus-track.c
index 3f3a494fc3239c9759c3eebdb2d10b9fe01dd9f6..9714da690f6ee88fb5345b476651b4c11448929b 100644 (file)
--- a/src/libelogind/sd-bus/bus-track.c
+++ b/src/libelogind/sd-bus/bus-track.c
@@ -472,7 +472,6 @@ _public_ void *sd_bus_track_set_userdata(sd_bus_track *track, void *userdata) {
 
         return ret;
 }
 
         return ret;
 }

-#endif // 0

 
 _public_ int sd_bus_track_set_recursive(sd_bus_track *track, int b) {
         assert_return(track, -EINVAL);
 
 _public_ int sd_bus_track_set_recursive(sd_bus_track *track, int b) {
         assert_return(track, -EINVAL);


@@ -525,3 +524,4 @@ _public_ int sd_bus_track_count_name(sd_bus_track *track, const char *name) {
 
         return i->n_ref;
 }
 
         return i->n_ref;
 }

+#endif // 0

diff --git a/src/libelogind/sd-bus/sd-bus.c b/src/libelogind/sd-bus/sd-bus.c
index 4cc6fb680f36f7292bbf445b7815d4d0d1a8f441..3c6b210bd2a7fc279e17bb7d2e7622765bb211a9 100644 (file)
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -3890,8 +3890,10 @@ _public_ int sd_bus_set_exit_on_disconnect(sd_bus *bus, int b) {
         return bus_exit_now(bus);
 }
 
         return bus_exit_now(bus);
 }
 

+#if 0 /// UNNEEDED by elogind

 _public_ int sd_bus_get_exit_on_disconnect(sd_bus *bus) {
         assert_return(bus, -EINVAL);
 
         return bus->exit_on_disconnect;
 }
 _public_ int sd_bus_get_exit_on_disconnect(sd_bus *bus) {
         assert_return(bus, -EINVAL);
 
         return bus->exit_on_disconnect;
 }

+#endif // 0

diff --git a/src/libelogind/sd-id128/sd-id128.c b/src/libelogind/sd-id128/sd-id128.c
index d4450c70a003c357b0dafce92a542e2f67f87459..e51efb4dd30df558f48489554add70adcd88cd54 100644 (file)
--- a/src/libelogind/sd-id128/sd-id128.c
+++ b/src/libelogind/sd-id128/sd-id128.c
@@ -129,6 +129,7 @@ _public_ int sd_id128_get_boot(sd_id128_t *ret) {
         return 0;
 }
 
         return 0;
 }
 

+#if 0 /// UNNEEDED by elogind

 _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
         static thread_local sd_id128_t saved_invocation_id = {};
         int r;
 _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
         static thread_local sd_id128_t saved_invocation_id = {};
         int r;


@@ -150,6 +151,7 @@ _public_ int sd_id128_get_invocation(sd_id128_t *ret) {
         *ret = saved_invocation_id;
         return 0;
 }
         *ret = saved_invocation_id;
         return 0;
 }

+#endif // 0

 
 static sd_id128_t make_v4_uuid(sd_id128_t id) {
         /* Stolen from generate_random_uuid() of drivers/char/random.c
 
 static sd_id128_t make_v4_uuid(sd_id128_t id) {
         /* Stolen from generate_random_uuid() of drivers/char/random.c

diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 8df67b76b8796c30a71f09e71e625e8720bea32f..997cf9f00bca1ab3677067fd30b1ac18d6b59c27 100644 (file)
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -154,7 +154,9 @@ int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b);
 int sd_bus_get_allow_interactive_authorization(sd_bus *bus);
 #endif // 0
 int sd_bus_set_exit_on_disconnect(sd_bus *bus, int b);
 int sd_bus_get_allow_interactive_authorization(sd_bus *bus);
 #endif // 0
 int sd_bus_set_exit_on_disconnect(sd_bus *bus, int b);

+#if 0 /// UNNEEDED by elogind

 int sd_bus_get_exit_on_disconnect(sd_bus *bus);
 int sd_bus_get_exit_on_disconnect(sd_bus *bus);

+#endif // 0

 
 int sd_bus_start(sd_bus *ret);
 
 
 int sd_bus_start(sd_bus *ret);
 


@@ -508,12 +510,16 @@ int sd_bus_track_remove_sender(sd_bus_track *track, sd_bus_message *m);
 int sd_bus_track_add_name(sd_bus_track *track, const char *name);
 int sd_bus_track_remove_name(sd_bus_track *track, const char *name);
 
 int sd_bus_track_add_name(sd_bus_track *track, const char *name);
 int sd_bus_track_remove_name(sd_bus_track *track, const char *name);
 

+#if 0 /// UNNEEDED by elogind

 int sd_bus_track_set_recursive(sd_bus_track *track, int b);
 int sd_bus_track_get_recursive(sd_bus_track *track);
 int sd_bus_track_set_recursive(sd_bus_track *track, int b);
 int sd_bus_track_get_recursive(sd_bus_track *track);

+#endif // 0

 
 unsigned sd_bus_track_count(sd_bus_track *track);
 
 unsigned sd_bus_track_count(sd_bus_track *track);

+#if 0 /// UNNEEDED by elogind

 int sd_bus_track_count_sender(sd_bus_track *track, sd_bus_message *m);
 int sd_bus_track_count_name(sd_bus_track *track, const char *name);
 int sd_bus_track_count_sender(sd_bus_track *track, sd_bus_message *m);
 int sd_bus_track_count_name(sd_bus_track *track, const char *name);

+#endif // 0

 
 const char* sd_bus_track_contains(sd_bus_track *track, const char *name);
 const char* sd_bus_track_first(sd_bus_track *track);
 
 const char* sd_bus_track_contains(sd_bus_track *track, const char *name);
 const char* sd_bus_track_first(sd_bus_track *track);

diff --git a/src/systemd/sd-id128.h b/src/systemd/sd-id128.h
index ee011b1861b7531d83d67486cb74865a2dd5fbd8..1977e62e94f7837c2056715499ae7bc5469fc5a2 100644 (file)
--- a/src/systemd/sd-id128.h
+++ b/src/systemd/sd-id128.h
@@ -46,7 +46,9 @@ int sd_id128_randomize(sd_id128_t *ret);
 
 int sd_id128_get_machine(sd_id128_t *ret);
 int sd_id128_get_boot(sd_id128_t *ret);
 
 int sd_id128_get_machine(sd_id128_t *ret);
 int sd_id128_get_boot(sd_id128_t *ret);

+#if 0 /// UNNEEDED by elogind

 int sd_id128_get_invocation(sd_id128_t *ret);
 int sd_id128_get_invocation(sd_id128_t *ret);

+#endif // 0

 
 #define SD_ID128_MAKE(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \
         ((const sd_id128_t) { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \
 
 #define SD_ID128_MAKE(v0, v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12, v13, v14, v15) \
         ((const sd_id128_t) { .bytes = { 0x##v0, 0x##v1, 0x##v2, 0x##v3, 0x##v4, 0x##v5, 0x##v6, 0x##v7, \