X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshared%2Fconf-files.h;h=368c112eb313c38fc7e5f889103220d8cccc2a63;hp=f37ee1f3dbfdc077d0e0af7de30012a83eacc2b5;hb=6baa7db00812437bbc87e73faa1a11b6cf631958;hpb=f274ece0f76b5709408821e317e87aef76123db6 diff --git a/src/shared/conf-files.h b/src/shared/conf-files.h index f37ee1f3d..368c112eb 100644 --- a/src/shared/conf-files.h +++ b/src/shared/conf-files.h @@ -1,7 +1,6 @@ /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -#ifndef fooconffileshfoo -#define fooconffileshfoo +#pragma once /*** This file is part of systemd. @@ -25,7 +24,6 @@ #include "macro.h" -int conf_files_list(char ***strv, const char *suffix, const char *dir, ...); -int conf_files_list_strv(char ***strv, const char *suffix, const char **dirs); - -#endif +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);