Prep v226: Mask all unneeded functions

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index ec42e258ab5728b07e08203482c957d534af4c8f..08259fcfc5dfcdfe305e808860a2b9aa39c76241 100644 (file)
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2141,6 +2141,8 @@ int cg_unified(void) {
         return unified_cache;
 }
 
         return unified_cache;
 }
 

+/// UNNEEDED by elogind
+#if 0

 void cg_unified_flush(void) {
         unified_cache = -1;
 }
 void cg_unified_flush(void) {
         unified_cache = -1;
 }


@@ -2187,6 +2189,7 @@ int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p) {
 
         return 0;
 }
 
         return 0;
 }

+#endif // 0

 
 bool cg_is_unified_wanted(void) {
         static thread_local int wanted = -1;
 
 bool cg_is_unified_wanted(void) {
         static thread_local int wanted = -1;


@@ -2220,9 +2223,12 @@ bool cg_is_unified_wanted(void) {
         }
 }
 
         }
 }
 

+/// UNNEEDED by elogind
+#if 0

 bool cg_is_legacy_wanted(void) {
         return !cg_is_unified_wanted();
 }
 bool cg_is_legacy_wanted(void) {
         return !cg_is_unified_wanted();
 }

+#endif // 0

 
 static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
         [CGROUP_CONTROLLER_CPU] = "cpu",
 
 static const char *cgroup_controller_table[_CGROUP_CONTROLLER_MAX] = {
         [CGROUP_CONTROLLER_CPU] = "cpu",

diff --git a/src/basic/cgroup-util.h b/src/basic/cgroup-util.h
index 7b0ec648a5d024dd7ce66c32d6c8e93fa372222d..e1cbd6cd1b52c0bfa9c2dad105d27d1600eb5554 100644 (file)
--- a/src/basic/cgroup-util.h
+++ b/src/basic/cgroup-util.h
@@ -145,17 +145,17 @@ int cg_attach_everywhere(CGroupMask supported, const char *path, pid_t pid, cg_m
 // UNNEEDED int cg_attach_many_everywhere(CGroupMask supported, const char *path, Set* pids, cg_migrate_callback_t callback, void *userdata);
 // UNNEEDED int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to, cg_migrate_callback_t callback, void *userdata);
 // UNNEEDED int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root);
 // UNNEEDED int cg_attach_many_everywhere(CGroupMask supported, const char *path, Set* pids, cg_migrate_callback_t callback, void *userdata);
 // UNNEEDED int cg_migrate_everywhere(CGroupMask supported, const char *from, const char *to, cg_migrate_callback_t callback, void *userdata);
 // UNNEEDED int cg_trim_everywhere(CGroupMask supported, const char *path, bool delete_root);

-int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p);
+// UNNEEDED int cg_enable_everywhere(CGroupMask supported, CGroupMask mask, const char *p);

 
 // UNNEEDED int cg_mask_supported(CGroupMask *ret);
 
 // UNNEEDED int cg_kernel_controllers(Set *controllers);
 
 int cg_unified(void);
 
 // UNNEEDED int cg_mask_supported(CGroupMask *ret);
 
 // UNNEEDED int cg_kernel_controllers(Set *controllers);
 
 int cg_unified(void);

-void cg_unified_flush(void);
+// UNNEEDED void cg_unified_flush(void);

 
 bool cg_is_unified_wanted(void);
 
 bool cg_is_unified_wanted(void);

-bool cg_is_legacy_wanted(void);
+// UNNEEDED bool cg_is_legacy_wanted(void);

 
 const char* cgroup_controller_to_string(CGroupController c) _const_;
 CGroupController cgroup_controller_from_string(const char *s) _pure_;
 
 const char* cgroup_controller_to_string(CGroupController c) _const_;
 CGroupController cgroup_controller_from_string(const char *s) _pure_;

diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index f221c6ff1dc31fb3cf5c922413f42057fc6d6574..a55b4149d4eff9e9350ef13f9d7846fd6bed6de6 100644 (file)
--- a/src/basic/hostname-util.c
+++ b/src/basic/hostname-util.c
@@ -159,6 +159,8 @@ bool is_localhost(const char *hostname) {
                endswith_no_case(hostname, ".localdomain.");
 }
 
                endswith_no_case(hostname, ".localdomain.");
 }
 

+/// UNNEEDED by elogind
+#if 0

 bool is_gateway_hostname(const char *hostname) {
         assert(hostname);
 
 bool is_gateway_hostname(const char *hostname) {
         assert(hostname);
 


@@ -170,8 +172,6 @@ bool is_gateway_hostname(const char *hostname) {
                 strcaseeq(hostname, "gateway.");
 }
 
                 strcaseeq(hostname, "gateway.");
 }
 

-/// UNNEEDED by elogind
-#if 0

 int sethostname_idempotent(const char *s) {
         char buf[HOST_NAME_MAX + 1] = {};
 
 int sethostname_idempotent(const char *s) {
         char buf[HOST_NAME_MAX + 1] = {};
 

diff --git a/src/basic/hostname-util.h b/src/basic/hostname-util.h
index aab3a495b026780c7429968b9e16b0010b5e8e79..e96cd5f8716341e01782eb91348dbadfe754b2da 100644 (file)
--- a/src/basic/hostname-util.h
+++ b/src/basic/hostname-util.h
@@ -35,7 +35,7 @@ char* hostname_cleanup(char *s);
 #define machine_name_is_valid(s) hostname_is_valid(s, false)
 
 bool is_localhost(const char *hostname);
 #define machine_name_is_valid(s) hostname_is_valid(s, false)
 
 bool is_localhost(const char *hostname);

-bool is_gateway_hostname(const char *hostname);
+// UNNEEDED bool is_gateway_hostname(const char *hostname);

 
 // UNNEEDED int sethostname_idempotent(const char *s);
 
 
 // UNNEEDED int sethostname_idempotent(const char *s);
 

diff --git a/src/basic/strv.c b/src/basic/strv.c
index b6e6d505013619cd20e4daa929634d7b0eb58449..ea5e57acdb0430406f7d8c7b03652cbe207163c8 100644 (file)
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -713,7 +713,6 @@ char **strv_reverse(char **l) {
 
         return l;
 }
 
         return l;
 }

-#endif // 0

 
 char **strv_shell_escape(char **l, const char *bad) {
         char **s;
 
 char **strv_shell_escape(char **l, const char *bad) {
         char **s;


@@ -734,6 +733,7 @@ char **strv_shell_escape(char **l, const char *bad) {
 
         return l;
 }
 
         return l;
 }

+#endif // 0

 
 bool strv_fnmatch(char* const* patterns, const char *s, int flags) {
         char* const* p;
 
 bool strv_fnmatch(char* const* patterns, const char *s, int flags) {
         char* const* p;

diff --git a/src/basic/strv.h b/src/basic/strv.h
index 2dbd6d7f5fd58fadad42517d74763c0bac7aa9d4..d1dbe83d3c265b39120d86846fe5279bb9e53896 100644 (file)
--- a/src/basic/strv.h
+++ b/src/basic/strv.h
@@ -145,7 +145,7 @@ void strv_print(char **l);
         }))
 
 // UNNEEDED char **strv_reverse(char **l);
         }))
 
 // UNNEEDED char **strv_reverse(char **l);

-char **strv_shell_escape(char **l, const char *bad);
+// UNNEEDED char **strv_shell_escape(char **l, const char *bad);

 
 bool strv_fnmatch(char* const* patterns, const char *s, int flags);
 
 
 bool strv_fnmatch(char* const* patterns, const char *s, int flags);
 

diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 51abc78ce2b98cbd2a56d8b972e8fae6652a3123..8e101c60a18f18af2c859a9a6063434e2a574d0b 100644 (file)
--- a/src/basic/terminal-util.c
+++ b/src/basic/terminal-util.c
@@ -1093,6 +1093,8 @@ int get_ctty(pid_t pid, dev_t *_devnr, char **r) {
         return 0;
 }
 
         return 0;
 }
 

+/// UNNEEDED by elogind
+#if 0

 int ptsname_namespace(int pty, char **ret) {
         int no = -1, r;
 
 int ptsname_namespace(int pty, char **ret) {
         int no = -1, r;
 


@@ -1111,3 +1113,4 @@ int ptsname_namespace(int pty, char **ret) {
 
         return 0;
 }
 
         return 0;
 }

+#endif // 0

diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index fc61e3abde18c0da7eec6e91ba4b8976ae270b19..7fddb2959fa3886dd06ab36856219fe3f64d15a6 100644 (file)
--- a/src/basic/terminal-util.h
+++ b/src/basic/terminal-util.h
@@ -108,4 +108,4 @@ int get_ctty(pid_t, dev_t *_devnr, char **r);
 int getttyname_malloc(int fd, char **r);
 // UNNEEDED int getttyname_harder(int fd, char **r);
 
 int getttyname_malloc(int fd, char **r);
 // UNNEEDED int getttyname_harder(int fd, char **r);
 

-int ptsname_namespace(int pty, char **ret);
+// UNNEEDED int ptsname_namespace(int pty, char **ret);

diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c
index 0f5b7163e40ac6329f87e061c39a5575b868b02a..7931b8f482001c36c3695f15cd7468962adfbeb1 100644 (file)
--- a/src/basic/unit-name.c
+++ b/src/basic/unit-name.c
@@ -624,6 +624,8 @@ const char* unit_dbus_interface_from_type(UnitType t) {
         return table[t];
 }
 
         return table[t];
 }
 

+/// UNNEEDED by elogind
+#if 0

 const char *unit_dbus_interface_from_name(const char *name) {
         UnitType t;
 
 const char *unit_dbus_interface_from_name(const char *name) {
         UnitType t;
 


@@ -633,6 +635,7 @@ const char *unit_dbus_interface_from_name(const char *name) {
 
         return unit_dbus_interface_from_type(t);
 }
 
         return unit_dbus_interface_from_type(t);
 }

+#endif // 0

 
 static char *do_escape_mangle(const char *f, UnitNameMangle allow_globs, char *t) {
         const char *valid_chars;
 
 static char *do_escape_mangle(const char *f, UnitNameMangle allow_globs, char *t) {
         const char *valid_chars;

diff --git a/src/basic/unit-name.h b/src/basic/unit-name.h
index 2e04c7d2003bcab3b72dc244b7eda3f6d894922b..7b3924de8b61f4c55276d1af9786c843da9bc372 100644 (file)
--- a/src/basic/unit-name.h
+++ b/src/basic/unit-name.h
@@ -153,7 +153,7 @@ char *unit_dbus_path_from_name(const char *name);
 int unit_name_from_dbus_path(const char *path, char **name);
 
 const char* unit_dbus_interface_from_type(UnitType t);
 int unit_name_from_dbus_path(const char *path, char **name);
 
 const char* unit_dbus_interface_from_type(UnitType t);

-const char *unit_dbus_interface_from_name(const char *name);
+// UNNEEDED const char *unit_dbus_interface_from_name(const char *name);

 
 typedef enum UnitNameMangle {
         UNIT_NAME_NOGLOB,
 
 typedef enum UnitNameMangle {
         UNIT_NAME_NOGLOB,

diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 5dec923e0bd5afd305108a3f7f8ba91932f91b43..588532fae8c7172df3d0d65af8ef943669a0cb7c 100644 (file)
--- a/src/shared/conf-parser.c
+++ b/src/shared/conf-parser.c
@@ -579,6 +579,8 @@ int config_parse_bool(const char* unit,
         return 0;
 }
 
         return 0;
 }
 

+/// UNNEEDED by elogind
+#if 0

 int config_parse_tristate(
                 const char* unit,
                 const char *filename,
 int config_parse_tristate(
                 const char* unit,
                 const char *filename,


@@ -611,6 +613,7 @@ int config_parse_tristate(
         *t = !!k;
         return 0;
 }
         *t = !!k;
         return 0;
 }

+#endif // 0

 
 int config_parse_string(
                 const char *unit,
 
 int config_parse_string(
                 const char *unit,


@@ -869,6 +872,8 @@ int config_parse_signal(
         return 0;
 }
 
         return 0;
 }
 

+/// UNNEEDED by elogind
+#if 0

 int config_parse_personality(
                 const char *unit,
                 const char *filename,
 int config_parse_personality(
                 const char *unit,
                 const char *filename,


@@ -897,3 +902,4 @@ int config_parse_personality(
         *personality = p;
         return 0;
 }
         *personality = p;
         return 0;
 }

+#endif // 0

diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index dd547d1fd01dadd37c4acc533d482e7386bb5089..08ea1f76d024490d43a9937d492847ec74b2fff8 100644 (file)
--- a/src/shared/conf-parser.h
+++ b/src/shared/conf-parser.h
@@ -111,7 +111,7 @@ int config_parse_iec_size(const char *unit, const char *filename, unsigned line,
 // 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);
 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_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);
 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);

-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 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);

 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_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);


@@ -121,7 +121,7 @@ int config_parse_mode(const char *unit, const char *filename, unsigned line, con
 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);
 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);
 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);
 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);

-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 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);

 
 #define log_invalid_utf8(unit, level, config_file, config_line, error, rvalue) \
         do {                                                            \
 
 #define log_invalid_utf8(unit, level, config_file, config_line, error, rvalue) \
         do {                                                            \