fileio: fix verification on failure in write_string_file_full()

Fixes a bug introduced by 0ab5e2a4b4f5d435cb66b591ef5c700894663fd3.

diff --git a/src/basic/fileio.c b/src/basic/fileio.c
index 9f2bbc13236d9699da0fc9bb6b2514e69624560f..61b58d39c02e58d4f3d3527994a036788e284604 100644 (file)
--- a/src/basic/fileio.c
+++ b/src/basic/fileio.c
@@ -380,7 +380,7 @@ fail:
 
         /* OK, the operation failed, but let's see if the right contents in place already. If so, eat up the
          * error. */
-        if (verify_file(fn, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE) || (flags & WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE)) > 0)
+        if (verify_file_at(dir_fd, fn, line, !(flags & WRITE_STRING_FILE_AVOID_NEWLINE) || (flags & WRITE_STRING_FILE_VERIFY_IGNORE_NEWLINE)) > 0)
                 return 0;
 
         return r;

diff --git a/src/basic/fileio.h b/src/basic/fileio.h
index bd053050e1a7d0717f86c9c4c5c73fe80d222082..52d80e129e4fe48551270c1326ad28b622405ecd 100644 (file)
--- a/src/basic/fileio.h
+++ b/src/basic/fileio.h
@@ -90,9 +90,6 @@ static inline int read_full_stream(FILE *f, char **ret_contents, size_t *ret_siz
 }
 
 int verify_file_at(int dir_fd, const char *fn, const char *blob, bool accept_extra_nl);
-static inline int verify_file(const char *fn, const char *blob, bool accept_extra_nl) {
-        return verify_file_at(AT_FDCWD, fn, blob, accept_extra_nl);
-}
 
 int script_get_shebang_interpreter(const char *path, char **ret);