SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

os-util: drop redundant declaration of load_os_release_pairs()

Browse Source
This commit is contained in:
Yu Watanabe
2023-04-11 05:20:15 +09:00
parent d67071d2f6
commit 8c14d828d4
2 changed files with 3 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/basic/os-util.c
-15
View File
@@ -309,18 +309,6 @@ int _parse_os_release(const char *root, ...) {
return r;
}
int load_os_release_pairs(const char *root, char ***ret) {
_cleanup_fclose_ FILE *f = NULL;
_cleanup_free_ char *p = NULL;
int r;
r = fopen_os_release(root, &p, &f);
if (r < 0)
return r;
return load_env_file_pairs(f, p, ret);
}
int load_os_release_pairs_with_prefix(const char *root, const char *prefix, char ***ret) {
_cleanup_strv_free_ char **os_release_pairs = NULL, **os_release_pairs_prefixed = NULL;
int r;
@@ -355,9 +343,6 @@ int load_extension_release_pairs(const char *root, ImageClass image_class, const
_cleanup_free_ char *p = NULL;
int r;
assert(image_class >= 0);
assert(image_class < _IMAGE_CLASS_MAX);
r = fopen_extension_release(root, image_class, extension, relax_extension_release_check, &p, &f);
if (r < 0)
return r;
src/basic/os-util.h
+3 -1
View File
@@ -44,7 +44,9 @@ int _parse_os_release(const char *root, ...) _sentinel_;
#define parse_os_release(root, ...) _parse_os_release(root, __VA_ARGS__, NULL)
int load_extension_release_pairs(const char *root, ImageClass image_class, const char *extension, bool relax_extension_release_check, char ***ret);
int load_os_release_pairs(const char *root, char ***ret);
static inline int load_os_release_pairs(const char *root, char ***ret) {
return load_extension_release_pairs(root, _IMAGE_CLASS_INVALID, NULL, false, ret);
}
int load_os_release_pairs_with_prefix(const char *root, const char *prefix, char ***ret);
int os_release_support_ended(const char *support_end, bool quiet, usec_t *ret_eol);