X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fbasic%2Ffileio.h;h=6a628086bce173d47a6f38e702e8431e1f1f6011;hb=aa63b97173e12293234cce3b378912eb761778e1;hp=2469b4ca4d9fff3b78577c73d06015806c6fbbd2;hpb=35eec258c4523c92fe985d764198b266ebc3881a;p=elogind.git

diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index 2469b4ca4..6a628086b 100644
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -49,6 +49,8 @@ int parse_env_file(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 merge_env_file(char ***env, FILE *f, const char *fname);
+
 int write_env_file(const char *fname, char **l);
 
 int executable_is_script(const char *path, char **interpreter);
@@ -75,7 +77,7 @@ int search_and_fopen_nulstr(const char *path, const char *mode, const char *root
 int fflush_and_check(FILE *f);
 
 int fopen_temporary(const char *path, FILE **_f, char **_temp_path);
-int mkostemp_safe(char *pattern, int flags);
+int mkostemp_safe(char *pattern);
 
 int tempfn_xxxxxx(const char *p, const char *extra, char **ret);
 int tempfn_random(const char *p, const char *extra, char **ret);