From 380b82d6782b1d243bed5b78ce1df832ef6c683a Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 30 Nov 2018 16:56:35 +0100 Subject: [PATCH] conf-files: remove unused function --- src/basic/conf-files.c | 13 +------------ src/basic/conf-files.h | 1 - 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/basic/conf-files.c b/src/basic/conf-files.c index 3ba9f6b45d..2d0073279f 100644 --- a/src/basic/conf-files.c +++ b/src/basic/conf-files.c @@ -240,21 +240,10 @@ int conf_files_insert(char ***strv, const char *root, char **dirs, const char *p r = strv_insert(strv, i, t); if (r < 0) free(t); + return r; } -int conf_files_insert_nulstr(char ***strv, const char *root, const char *dirs, const char *path) { - _cleanup_strv_free_ char **d = NULL; - - assert(strv); - - d = strv_split_nulstr(dirs); - if (!d) - return -ENOMEM; - - return conf_files_insert(strv, root, d, path); -} - int conf_files_list_strv(char ***strv, const char *suffix, const char *root, unsigned flags, const char* const* dirs) { _cleanup_strv_free_ char **copy = NULL; diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h index f31f17de9d..55ab326402 100644 --- a/src/basic/conf-files.h +++ b/src/basic/conf-files.h @@ -15,7 +15,6 @@ int conf_files_list(char ***ret, const char *suffix, const char *root, unsigned int conf_files_list_strv(char ***ret, const char *suffix, const char *root, unsigned flags, const char* const* dirs); int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, unsigned flags, const char *dirs); int conf_files_insert(char ***strv, const char *root, char **dirs, const char *path); -int conf_files_insert_nulstr(char ***strv, const char *root, const char *dirs, const char *path); int conf_files_list_with_replacement( const char *root, char **config_dirs,