X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Fconf-files.h;h=3169a907f116d9ac05fa1e15654bbe24f3361204;hb=01c94c5d0aff09b4c0e429d483c8eeba40017071;hp=4d7941f4cb5265265382c7d11bbd4b1b03471bf3;hpb=7850b3b83791ba0e2377ba40383c5abc258b839d;p=elogind.git diff --git a/src/shared/conf-files.h b/src/shared/conf-files.h index 4d7941f4c..3169a907f 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. @@ -23,9 +22,7 @@ along with systemd; If not, see . ***/ -#include "macro.h" 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 **dirs); - -#endif +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);