From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 18 May 2017 05:25:40 +0000 (+0200)
Subject: Prep v229: Mask more unused functions in src/basic
X-Git-Tag: v229.1~1^2~6
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=e0a51e4dd37f53af54ab05fa41ce3c4a535a76d4

Prep v229: Mask more unused functions in src/basic
---

diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c
index c781610e1..92fc792d6 100644
--- a/src/basic/conf-files.c
+++ b/src/basic/conf-files.c
@@ -122,6 +122,7 @@ static int conf_files_list_strv_internal(char ***strv, const char *suffix, const
         return 0;
 }
 
+#if 0 /// UNNEEDED by elogind
 int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs) {
         _cleanup_strv_free_ char **copy = NULL;
 
@@ -151,6 +152,7 @@ int conf_files_list(char ***strv, const char *suffix, const char *root, const ch
 
         return conf_files_list_strv_internal(strv, suffix, root, dirs);
 }
+#endif // 0
 
 int conf_files_list_nulstr(char ***strv, const char *suffix, const char *root, const char *d) {
         _cleanup_strv_free_ char **dirs = NULL;
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h
index e00e0e81f..e77fdd472 100644
--- a/src/basic/conf-files.h
+++ b/src/basic/conf-files.h
@@ -20,6 +20,8 @@
   along with systemd; If not, see <http://www.gnu.org/licenses/>.
 ***/
 
+#if 0 /// UNNEEDED by elogind
 int conf_files_list(char ***ret, const char *suffix, const char *root, const char *dir, ...);
 int conf_files_list_strv(char ***ret, const char *suffix, const char *root, const char* const* dirs);
+#endif // 0
 int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, const char *dirs);
diff --git a/src/basic/escape.c b/src/basic/escape.c
index 2e483880c..564149306 100644
--- a/src/basic/escape.c
+++ b/src/basic/escape.c
@@ -413,6 +413,7 @@ char *xescape(const char *s, const char *bad) {
         return r;
 }
 
+#if 0 /// UNNEEDED by elogind
 static char *strcpy_backslash_escaped(char *t, const char *s, const char *bad) {
         assert(bad);
 
@@ -472,3 +473,4 @@ char *shell_maybe_quote(const char *s) {
 
         return r;
 }
+#endif // 0
diff --git a/src/basic/escape.h b/src/basic/escape.h
index 1b28bd10a..f57438038 100644
--- a/src/basic/escape.h
+++ b/src/basic/escape.h
@@ -49,5 +49,7 @@ int cunescape_one(const char *p, size_t length, char32_t *ret, bool *eight_bit);
 
 char *xescape(const char *s, const char *bad);
 
+#if 0 /// UNNEEDED by elogind
 char *shell_escape(const char *s, const char *bad);
 char *shell_maybe_quote(const char *s);
+#endif // 0
diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index f2a8f29e6..3bb1d3e03 100644
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -645,6 +645,7 @@ int parse_env_file(
         return r < 0 ? r : n_pushed;
 }
 
+#if 0 /// UNNEEDED by elogind
 static int load_env_file_push(
                 const char *filename, unsigned line,
                 const char *key, char *value,
@@ -700,7 +701,6 @@ int load_env_file(FILE *f, const char *fname, const char *newline, char ***rl) {
         return 0;
 }
 
-#if 0 /// UNNEDED by elogind
 static int load_env_file_push_pairs(
                 const char *filename, unsigned line,
                 const char *key, char *value,
@@ -759,7 +759,6 @@ int load_env_file_pairs(FILE *f, const char *fname, const char *newline, char **
         *rl = m;
         return 0;
 }
-#endif // 0
 
 static void write_env_var(FILE *f, const char *v) {
         const char *p;
@@ -821,7 +820,6 @@ int write_env_file(const char *fname, char **l) {
         return r;
 }
 
-#if 0 /// UNNEEDED by elogind
 int executable_is_script(const char *path, char **interpreter) {
         int r;
         _cleanup_free_ char *line = NULL;
diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 0d4de515e..0635147b7 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -45,12 +45,12 @@ int read_full_stream(FILE *f, char **contents, size_t *size);
 int verify_file(const char *fn, const char *blob, bool accept_extra_nl);
 
 int parse_env_file(const char *fname, const char *separator, ...) _sentinel_;
+#if 0 /// UNNEEDED by elogind
 int load_env_file(FILE *f, const char *fname, const char *separator, char ***l);
 int load_env_file_pairs(FILE *f, const char *fname, const char *separator, char ***l);
 
 int write_env_file(const char *fname, char **l);
 
-#if 0 /// UNNEEDED by elogind
 int executable_is_script(const char *path, char **interpreter);
 #endif // 0
 
diff --git a/src/basic/umask-util.h b/src/basic/umask-util.h
index 359d87d27..be90d5a3c 100644
--- a/src/basic/umask-util.h
+++ b/src/basic/umask-util.h
@@ -31,6 +31,7 @@ static inline void umaskp(mode_t *u) {
 
 #define _cleanup_umask_ _cleanup_(umaskp)
 
+#if 0 /// UNNEEDED by elogind
 struct _umask_struct_ {
         mode_t mask;
         bool quit;
@@ -44,3 +45,4 @@ static inline void _reset_umask_(struct _umask_struct_ *s) {
         for (_cleanup_(_reset_umask_) struct _umask_struct_ _saved_umask_ = { umask(mask), false }; \
              !_saved_umask_.quit ;                                      \
              _saved_umask_.quit = true)
+#endif // 0