From: Sven Eden <yamakuzure@gmx.net>
Date: Tue, 12 Dec 2017 17:06:57 +0000 (+0100)
Subject: Prep v232.6: Make all supportable API functions visible
X-Git-Tag: v235.1~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=0888c85ed3ca19ec52616f423d89466ca1374589;p=elogind.git

Prep v232.6: Make all supportable API functions visible
 (v232 addition).
---

diff --git a/src/libelogind/libelogind.sym b/src/libelogind/libelogind.sym
index 79c219afb..e5a1e3073 100644
--- a/src/libelogind/libelogind.sym
+++ b/src/libelogind/libelogind.sym
@@ -509,12 +509,12 @@ global:
 
 LIBSYSTEMD_232 {
 global:
-        /* sd_bus_track_set_recursive; */
-        /* sd_bus_track_get_recursive; */
-        /* sd_bus_track_count_name; */
-        /* sd_bus_track_count_sender; */
+        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_bus_get_exit_on_disconnect;
         sd_id128_get_invocation;
 } LIBSYSTEMD_231;
 
diff --git a/src/libelogind/sd-bus/bus-track.c b/src/libelogind/sd-bus/bus-track.c
index 8a2248bc6..4acaf2479 100644
--- 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;
 }
 
-#if 0 /// UNNEEDED by elogind
 _public_ int sd_bus_track_set_recursive(sd_bus_track *track, int b) {
         assert_return(track, -EINVAL);
 
@@ -524,4 +523,3 @@ _public_ int sd_bus_track_count_name(sd_bus_track *track, const char *name) {
 
         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 38730da9e..1af0792d3 100644
--- a/src/libelogind/sd-bus/sd-bus.c
+++ b/src/libelogind/sd-bus/sd-bus.c
@@ -3656,10 +3656,8 @@ _public_ int sd_bus_set_exit_on_disconnect(sd_bus *bus, int b) {
         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;
 }
-#endif // 0
diff --git a/src/systemd/sd-bus.h b/src/systemd/sd-bus.h
index 1990dd6c5..22e7a95e5 100644
--- a/src/systemd/sd-bus.h
+++ b/src/systemd/sd-bus.h
@@ -149,9 +149,7 @@ int sd_bus_set_allow_interactive_authorization(sd_bus *bus, int b);
 int sd_bus_get_allow_interactive_authorization(sd_bus *bus);
 
 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);
-#endif // 0
 
 int sd_bus_start(sd_bus *ret);
 
@@ -446,16 +444,12 @@ 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);
 
-#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);
-#endif // 0
 
 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);
-#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);