X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=src%2Fbasic%2Ffileio.h;h=dae115e3bbc83fe7a64b38b0e066c792ecb3495b;hb=cd5a29ce983d0ccfa24b349288146d43b387c885;hp=a9e0c2526f4ee2e5fda4bbde0a9ad058c1a23f29;hpb=042cad5737917e6964ddddba72b8fcc0cb890877;p=thirdparty%2Fsystemd.git diff --git a/src/basic/fileio.h b/src/basic/fileio.h index a9e0c2526f4..dae115e3bbc 100644 --- a/src/basic/fileio.h +++ b/src/basic/fileio.h @@ -44,10 +44,11 @@ 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_filev(FILE *f, const char *fname, const char *separator, va_list ap); -int parse_env_file(FILE *f, const char *fname, const char *separator, ...) _sentinel_; -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 parse_env_filev(FILE *f, const char *fname, va_list ap); +int parse_env_file_sentinel(FILE *f, const char *fname, ...) _sentinel_; +#define parse_env_file(f, fname, ...) parse_env_file_sentinel(f, fname, __VA_ARGS__, NULL) +int load_env_file(FILE *f, const char *fname, char ***l); +int load_env_file_pairs(FILE *f, const char *fname, char ***l); int merge_env_file(char ***env, FILE *f, const char *fname);