Prep v233.2: Mask unneeded functions and definitions in src/shared

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index 33d564368501d1f88fc8bd83bf91bd99eaf3638f..f8ffa631c5fa51780258dba9e5be0253d666f68b 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1601,7 +1601,6 @@ int bus_property_get_rlimit(
 
         return sd_bus_message_append(reply, "t", u);
 }
-#endif // 0
 
 int bus_track_add_name_many(sd_bus_track *t, char **l) {
         int r = 0;
@@ -1621,3 +1620,4 @@ int bus_track_add_name_many(sd_bus_track *t, char **l) {
 
         return r;
 }
+#endif // 0

diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index 3f12ae5257f1683bd5eb95843ccac0877c174d8c..16147ebaf736f060b719a5abb6abc2cbe0c11aa6 100644 (file)
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -178,6 +178,6 @@ int bus_path_decode_unique(const char *path, const char *prefix, char **ret_send
 
 #if 0 /// UNNEEDED by elogind
 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
 
 int bus_track_add_name_many(sd_bus_track *t, char **l);
+#endif // 0

diff --git a/src/shared/nsflags.c b/src/shared/nsflags.c
index aeb79b131e09153474e2ac24769fea5ca3a1c6f2..9d64b02750a6b5763e18a5c9c3845ec66b1e1456 100644 (file)
--- a/src/shared/nsflags.c
+++ b/src/shared/nsflags.c
@@ -62,6 +62,7 @@ unsigned long namespace_flag_from_string(const char *name) {
         return 0;
 }
 
+#if 0 /// UNNEEDED by elogind
 int namespace_flag_from_string_many(const char *name, unsigned long *ret) {
         unsigned long flags = 0;
         int r;
@@ -88,6 +89,7 @@ int namespace_flag_from_string_many(const char *name, unsigned long *ret) {
         *ret = flags;
         return 0;
 }
+#endif // 0
 
 int namespace_flag_to_string_many(unsigned long flags, char **ret) {
         _cleanup_free_ char *s = NULL;

diff --git a/src/shared/nsflags.h b/src/shared/nsflags.h
index 152ab8b9363534bf40d2367d96af43d7224bf54c..58cfdce563b65e5ee9ec34aab052cc8866e9de25 100644 (file)
--- a/src/shared/nsflags.h
+++ b/src/shared/nsflags.h
@@ -38,7 +38,9 @@
 
 const char* namespace_flag_to_string(unsigned long flag);
 unsigned long namespace_flag_from_string(const char *name);
+#if 0 /// UNNEEDED by elogind
 int namespace_flag_from_string_many(const char *name, unsigned long *ret);
+#endif // 0
 int namespace_flag_to_string_many(unsigned long flags, char **ret);
 
 struct namespace_flag_map {