diff options
| author | Tom Gundersen <teg@jklm.no> | 2015-09-07 02:59:08 +0200 |
|---|---|---|
| committer | Tom Gundersen <teg@jklm.no> | 2015-09-07 02:59:08 +0200 |
| commit | 6167a91c745e5406164ef57e27212ba572d9a0dc (patch) | |
| tree | 35af349cc76d850d1593163d8dabfd4c59dfe267 /src/basic | |
| parent | 2009bcfd23400bacd50848ac3e72cd5f6fbe53db (diff) | |
| parent | 08acb521f30d692f13056daa23fb1323528249ff (diff) | |
Merge pull request #1165 from poettering/nspawn-files
various fixes to the core, logind, machined, nspawn
Diffstat (limited to 'src/basic')
| -rw-r--r-- | src/basic/conf-files.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/basic/conf-files.h b/src/basic/conf-files.h index 3169a907f1..d8aebc5e5b 100644 --- a/src/basic/conf-files.h +++ b/src/basic/conf-files.h @@ -22,7 +22,6 @@ along with systemd; If not, see <http://www.gnu.org/licenses/>. ***/ - -int conf_files_list(char ***strv, const char *suffix, const char *root, const char *dir, ...); -int conf_files_list_strv(char ***strv, const char *suffix, const char *root, const char* const* dirs); -int conf_files_list_nulstr(char ***strv, const char *suffix, const char *root, const char *dirs); +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); +int conf_files_list_nulstr(char ***ret, const char *suffix, const char *root, const char *dirs); |