os-util: drop fopen_extension_release()

diff --git a/src/basic/os-util.c b/src/basic/os-util.c
index 5f1c26b87c20cd049a57dd07aabcbbc9a8d1fc00..0bc1aeb25cc925b5cfbd242c3bd73d16b764572a 100644 (file)
--- a/src/basic/os-util.c
+++ b/src/basic/os-util.c
@@ -248,40 +248,16 @@ int open_extension_release(const char *root, ImageClass image_class, const char
         return 0;
 }
 
-int fopen_extension_release(const char *root, ImageClass image_class, const char *extension, bool relax_extension_release_check, char **ret_path, FILE **ret_file) {
-        _cleanup_free_ char *p = NULL;
-        _cleanup_close_ int fd = -EBADF;
-        FILE *f;
-        int r;
-
-        if (!ret_file)
-                return open_extension_release(root, image_class, extension, relax_extension_release_check, ret_path, NULL);
-
-        r = open_extension_release(root, image_class, extension, relax_extension_release_check, ret_path ? &p : NULL, &fd);
-        if (r < 0)
-                return r;
-
-        f = take_fdopen(&fd, "r");
-        if (!f)
-                return -errno;
-
-        if (ret_path)
-                *ret_path = TAKE_PTR(p);
-        *ret_file = f;
-
-        return 0;
-}
-
 static int parse_release_internal(const char *root, ImageClass image_class, bool relax_extension_release_check, const char *extension, va_list ap) {
-        _cleanup_fclose_ FILE *f = NULL;
+        _cleanup_close_ int fd = -EBADF;
         _cleanup_free_ char *p = NULL;
         int r;
 
-        r = fopen_extension_release(root, image_class, extension, relax_extension_release_check, &p, &f);
+        r = open_extension_release(root, image_class, extension, relax_extension_release_check, &p, &fd);
         if (r < 0)
                 return r;
 
-        return parse_env_filev(f, p, ap);
+        return parse_env_file_fdv(fd, p, ap);
 }
 
 int _parse_extension_release(const char *root, ImageClass image_class, bool relax_extension_release_check, const char *extension, ...) {
@@ -339,15 +315,15 @@ int load_os_release_pairs_with_prefix(const char *root, const char *prefix, char
 }
 
 int load_extension_release_pairs(const char *root, ImageClass image_class, const char *extension, bool relax_extension_release_check, char ***ret) {
-        _cleanup_fclose_ FILE *f = NULL;
+        _cleanup_close_ int fd = -EBADF;
         _cleanup_free_ char *p = NULL;
         int r;
 
-        r = fopen_extension_release(root, image_class, extension, relax_extension_release_check, &p, &f);
+        r = open_extension_release(root, image_class, extension, relax_extension_release_check, &p, &fd);
         if (r < 0)
                 return r;
 
-        return load_env_file_pairs(f, p, ret);
+        return load_env_file_pairs_fd(fd, p, ret);
 }
 
 int os_release_support_ended(const char *support_end, bool quiet, usec_t *ret_eol) {

diff --git a/src/basic/os-util.h b/src/basic/os-util.h
index 01dcde7a8085705c8c5e51f325d3d99386754d74..374b4ee584e43aaee8342d02c45cfed315e03c7c 100644 (file)
--- a/src/basic/os-util.h
+++ b/src/basic/os-util.h
@@ -33,11 +33,6 @@ static inline int open_os_release(const char *root, char **ret_path, int *ret_fd
         return open_extension_release(root, _IMAGE_CLASS_INVALID, NULL, false, ret_path, ret_fd);
 }
 
-int fopen_extension_release(const char *root, ImageClass image_class, const char *extension, bool relax_extension_release_check, char **ret_path, FILE **ret_file);
-static inline int fopen_os_release(const char *root, char **ret_path, FILE **ret_file) {
-        return fopen_extension_release(root, _IMAGE_CLASS_INVALID, NULL, false, ret_path, ret_file);
-}
-
 int _parse_extension_release(const char *root, ImageClass image_class, bool relax_extension_release_check, const char *extension, ...) _sentinel_;
 int _parse_os_release(const char *root, ...) _sentinel_;
 #define parse_extension_release(root, image_class, relax_extension_release_check, extension, ...) _parse_extension_release(root, image_class, relax_extension_release_check, extension, __VA_ARGS__, NULL)