From d1325d57413c007e17847074c70005c40e32bc9d Mon Sep 17 00:00:00 2001
From: Sven Eden <yamakuzure@gmx.net>
Date: Mon, 9 Jan 2017 06:04:26 +0100
Subject: [PATCH] Prep v226: Mask all unneeded functions

---
 src/basic/cgroup-util.c   | 6 ++++++
 src/basic/cgroup-util.h   | 6 +++---
 src/basic/hostname-util.c | 4 ++--
 src/basic/hostname-util.h | 2 +-
 src/basic/strv.c          | 2 +-
 src/basic/strv.h          | 2 +-
 src/basic/terminal-util.c | 3 +++
 src/basic/terminal-util.h | 2 +-
 src/basic/unit-name.c     | 3 +++
 src/basic/unit-name.h     | 2 +-
 src/shared/conf-parser.c  | 6 ++++++
 src/shared/conf-parser.h  | 4 ++--
 12 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/src/basic/cgroup-util.c b/src/basic/cgroup-util.c
index ec42e258a..08259fcfc 100644
--- a/src/basic/cgroup-util.c
+++ b/src/basic/cgroup-util.c
@@ -2141,6 +2141,8 @@ int cg_unified(void) {
         return unified_cache;
 }
 
+/// UNNEEDED by elogind
+#if 0
 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;
 }
+#endif // 0
 
 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();
 }
+#endif // 0
 
 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 7b0ec648a..e1cbd6cd1 100644
--- 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);
-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);
-void cg_unified_flush(void);
+// UNNEEDED void cg_unified_flush(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_;
diff --git a/src/basic/hostname-util.c b/src/basic/hostname-util.c
index f221c6ff1..a55b4149d 100644
--- 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.");
 }
 
+/// UNNEEDED by elogind
+#if 0
 bool is_gateway_hostname(const char *hostname) {
         assert(hostname);
 
@@ -170,8 +172,6 @@ bool is_gateway_hostname(const char *hostname) {
                 strcaseeq(hostname, "gateway.");
 }
 
-/// UNNEEDED by elogind
-#if 0
 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 aab3a495b..e96cd5f87 100644
--- 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);
-bool is_gateway_hostname(const char *hostname);
+// UNNEEDED bool is_gateway_hostname(const char *hostname);
 
 // UNNEEDED int sethostname_idempotent(const char *s);
 
diff --git a/src/basic/strv.c b/src/basic/strv.c
index b6e6d5050..ea5e57acd 100644
--- a/src/basic/strv.c
+++ b/src/basic/strv.c
@@ -713,7 +713,6 @@ char **strv_reverse(char **l) {
 
         return l;
 }
-#endif // 0
 
 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;
 }
+#endif // 0
 
 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 2dbd6d7f5..d1dbe83d3 100644
--- 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);
-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);
 
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c
index 51abc78ce..8e101c60a 100644
--- 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;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int ptsname_namespace(int pty, char **ret) {
         int no = -1, r;
 
@@ -1111,3 +1113,4 @@ int ptsname_namespace(int pty, char **ret) {
 
         return 0;
 }
+#endif // 0
diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h
index fc61e3abd..7fddb2959 100644
--- 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 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 0f5b7163e..7931b8f48 100644
--- 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];
 }
 
+/// UNNEEDED by elogind
+#if 0
 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);
 }
+#endif // 0
 
 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 2e04c7d20..7b3924de8 100644
--- 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);
-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,
diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c
index 5dec923e0..588532fae 100644
--- 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;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int config_parse_tristate(
                 const char* unit,
                 const char *filename,
@@ -611,6 +613,7 @@ int config_parse_tristate(
         *t = !!k;
         return 0;
 }
+#endif // 0
 
 int config_parse_string(
                 const char *unit,
@@ -869,6 +872,8 @@ int config_parse_signal(
         return 0;
 }
 
+/// UNNEEDED by elogind
+#if 0
 int config_parse_personality(
                 const char *unit,
                 const char *filename,
@@ -897,3 +902,4 @@ int config_parse_personality(
         *personality = p;
         return 0;
 }
+#endif // 0
diff --git a/src/shared/conf-parser.h b/src/shared/conf-parser.h
index dd547d1fd..08ea1f76d 100644
--- 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);
-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);
@@ -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_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 {                                                            \
-- 
2.30.2