Prep v232: Mask new functions that are unneeded by elogind

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index 16e299a7e2a8691806754de4be6d33c47aa9e692..64220ac085c0cbed5c5bcb12d76258e2ec0c4402 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -889,7 +889,6 @@ int cg_set_task_access(
 
         return 0;
 }
-#endif // 0
 
 int cg_set_xattr(const char *controller, const char *path, const char *name, const void *value, size_t size, int flags) {
         _cleanup_free_ char *fs = NULL;
@@ -927,6 +926,7 @@ int cg_get_xattr(const char *controller, const char *path, const char *name, voi
 
         return (int) n;
 }
+#endif // 0
 
 int cg_pid_get_path(const char *controller, pid_t pid, char **path) {
         _cleanup_fclose_ FILE *f = NULL;

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 327a525bfa4393225fc83bb737f8b92053713d4b..27ab8d6934b0db1d3102a0c37a00139e174c3ef4 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -189,10 +189,10 @@ int cg_get_keyed_attribute(const char *controller, const char *path, const char
 #if 0 /// UNNEEDED by elogind
 int cg_set_group_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid);
 int cg_set_task_access(const char *controller, const char *path, mode_t mode, uid_t uid, gid_t gid);
-#endif // 0
 
 int cg_set_xattr(const char *controller, const char *path, const char *name, const void *value, size_t size, int flags);
 int cg_get_xattr(const char *controller, const char *path, const char *name, void *value, size_t size);
+#endif // 0
 
 int cg_install_release_agent(const char *controller, const char *agent);
 int cg_uninstall_release_agent(const char *controller);
@@ -253,9 +253,9 @@ int cg_kernel_controllers(Set *controllers);
 bool cg_ns_supported(void);
 #endif // 0
 
-#if 0 /// UNNEEDED by elogind
 int cg_all_unified(void);
 int cg_unified(const char *controller);
+#if 0 /// UNNEEDED by elogind
 void cg_unified_flush(void);
 
 bool cg_is_unified_wanted(void);

diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c
index bfdf483229045c18eef1835825798cfd24a8e25a..b1cad55e7c1915090ff5f980f3d2ebe8677bdee6 100644 (file)
--- a/src/basic/parse-util.c
+++ b/src/basic/parse-util.c
@@ -567,6 +567,7 @@ int parse_percent(const char *p) {
         return v;
 }
 
+#if 0 /// UNNEEDED by elogind
 int parse_nice(const char *p, int *ret) {
         int n, r;
 
@@ -580,3 +581,4 @@ int parse_nice(const char *p, int *ret) {
         *ret = n;
         return 0;
 }
+#endif // 0

diff --git a/src/basic/parse-util.h b/src/basic/parse-util.h
index 2bcbadecfa2c4cab4492dc376044b960de800f6d..23b1937430a60d91293550a51ffeac1d2e127e6f 100644 (file)
--- a/src/basic/parse-util.h
+++ b/src/basic/parse-util.h
@@ -111,4 +111,6 @@ int parse_fractional_part_u(const char **s, size_t digits, unsigned *res);
 int parse_percent_unbounded(const char *p);
 int parse_percent(const char *p);
 
+#if 0 /// UNNEEDED by elogind
 int parse_nice(const char *p, int *ret);
+#endif // 0

diff --git a/src/basic/path-util.c b/src/basic/path-util.c
index 3422340b6b4c5402f1ba5f72aa45737be8c894fd..8cb013e6cb2beea724909568d0ca6bed93a55045 100644 (file)
--- a/src/basic/path-util.c
+++ b/src/basic/path-util.c
@@ -34,7 +34,6 @@
 #include "alloc-util.h"
 #include "extract-word.h"
 #include "fs-util.h"
-#include "glob-util.h"
 #include "log.h"
 #include "macro.h"
 #include "missing.h"
@@ -835,7 +834,6 @@ bool is_deviceallow_pattern(const char *path) {
                startswith(path, "block-") ||
                startswith(path, "char-");
 }
-#endif // 0
 
 int systemd_installation_has_version(const char *root, unsigned minimal_version) {
         const char *pattern;
@@ -902,3 +900,4 @@ int systemd_installation_has_version(const char *root, unsigned minimal_version)
 
         return false;
 }
+#endif // 0

diff --git a/src/basic/path-util.h b/src/basic/path-util.h
index cdb194d2a34bb3a02e7ae6b4984be6c394e37726..605485665d2962f9652ff9c7828143ded583be01 100644 (file)
--- a/src/basic/path-util.h
+++ b/src/basic/path-util.h
@@ -140,7 +140,7 @@ bool hidden_or_backup_file(const char *filename) _pure_;
 
 #if 0 /// UNNEEDED by elogind
 bool is_device_path(const char *path);
-#endif // 0
 bool is_deviceallow_pattern(const char *path);
 
 int systemd_installation_has_version(const char *root, unsigned minimal_version);
+#endif // 0

diff --git a/src/basic/process-util.h b/src/basic/process-util.h
index 6a41db18485c9910ee872758fc24577acaf3e39a..c05d05d7831990381c25f45590e2810a63d81422 100644 (file)
--- a/src/basic/process-util.h
+++ b/src/basic/process-util.h
@@ -114,6 +114,8 @@ void valgrind_summary_hack(void);
 
 int pid_compare_func(const void *a, const void *b);
 
+#if 0 /// UNNEEDED by elogind
 static inline bool nice_is_valid(int n) {
         return n >= PRIO_MIN && n < PRIO_MAX;
 }
+#endif // 0

diff --git a/src/libelogind/sd-bus/bus-common-errors.c b/src/libelogind/sd-bus/bus-common-errors.c
index ed3f5fa38e426b3e32982e240c2ed0118ccd4827..ca027100671cd1d1f5e4cdf7527c231979e2fab6 100644 (file)
--- a/src/libelogind/sd-bus/bus-common-errors.c
+++ b/src/libelogind/sd-bus/bus-common-errors.c
@@ -54,9 +54,9 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = {
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_MACHINE_FOR_PID,           ENXIO),
         SD_BUS_ERROR_MAP(BUS_ERROR_MACHINE_EXISTS,               EEXIST),
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_PRIVATE_NETWORKING,        ENOSYS),
-#endif // 0
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_USER_MAPPING,         ENXIO),
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_GROUP_MAPPING,        ENXIO),
+#endif // 0
 
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_SUCH_SESSION,              ENXIO),
         SD_BUS_ERROR_MAP(BUS_ERROR_NO_SESSION_FOR_PID,           ENXIO),

diff --git a/src/shared/bus-util.c b/src/shared/bus-util.c
index d22a613af56c9b4e794726fd6f461c0d1850fbc4..8bba92092f51eac37102818faba3cef111888d57 100644 (file)
--- a/src/shared/bus-util.c
+++ b/src/shared/bus-util.c
@@ -1334,6 +1334,7 @@ int bus_property_get_bool(
         return sd_bus_message_append_basic(reply, 'b', &b);
 }
 
+#if 0 /// UNNEEDED by elogind
 int bus_property_get_id128(
                 sd_bus *bus,
                 const char *path,
@@ -1350,6 +1351,7 @@ int bus_property_get_id128(
         else
                 return sd_bus_message_append_array(reply, 'y', id->bytes, 16);
 }
+#endif // 0
 
 #if __SIZEOF_SIZE_T__ != 8
 int bus_property_get_size(

diff --git a/src/shared/bus-util.h b/src/shared/bus-util.h
index 802983766f680909d64d5c366bff8739c6c4c7e9..614f626e0ce27ab32ef67600701b18101c0390a2 100644 (file)
--- a/src/shared/bus-util.h
+++ b/src/shared/bus-util.h
@@ -91,7 +91,9 @@ int bus_print_property(const char *name, sd_bus_message *property, bool value, b
 int bus_print_all_properties(sd_bus *bus, const char *dest, const char *path, char **filter, bool value, bool all);
 
 int bus_property_get_bool(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+#if 0 /// UNNEEDED by elogind
 int bus_property_get_id128(sd_bus *bus, const char *path, const char *interface, const char *property, sd_bus_message *reply, void *userdata, sd_bus_error *error);
+#endif // 0
 
 #define bus_property_get_usec ((sd_bus_property_get_t) NULL)
 #define bus_property_set_usec ((sd_bus_property_set_t) NULL)

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 92baba60378a1c2d7b706a673786f301baab1b4d..9190ec9b85bfd1bef75d61bc1ecaa4b3d63918c6 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -443,6 +443,7 @@ int config_parse_many_nulstr(
                                        sections, lookup, table, relaxed, userdata);
 }
 
+#if 0 /// UNNEEDED by elogind
 /* Parse each config file in the directories specified as strv. */
 int config_parse_many(
                 const char *conf_file,
@@ -471,6 +472,7 @@ int config_parse_many(
         return config_parse_many_files(conf_file, files,
                                        sections, lookup, table, relaxed, userdata);
 }
+#endif // 0
 
 #define DEFINE_PARSER(type, vartype, conv_func)                         \
         int config_parse_##type(                                        \

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index 2ca5aa63cde90a392a997d8902bcdc9609fa6b75..fe93c3c1e0b0ff47a3f905c98b23e718fab58f1b 100644 (file)
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -105,6 +105,7 @@ int config_parse_many_nulstr(
                 bool relaxed,
                 void *userdata);
 
+#if 0 /// UNNEEDED by elogind
 int config_parse_many(
                 const char *conf_file,      /* possibly NULL */
                 const char* const* conf_file_dirs,
@@ -114,6 +115,7 @@ int config_parse_many(
                 const void *table,
                 bool relaxed,
                 void *userdata);
+#endif // 0
 
 /* Generic parsers */
 int config_parse_int(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);