From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 9 Feb 2018 07:58:56 +0000 (+0900)
Subject: fs-util: drop readlink_and_make_absolute_root()
X-Git-Tag: v238~115^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01e4793de62743247398be71285797c1bb61bc24;p=thirdparty%2Fsystemd.git

fs-util: drop readlink_and_make_absolute_root()
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index bedde413896..cf856ae8e2c 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -225,26 +225,6 @@ int readlink_and_make_absolute(const char *p, char **r) {
         return 0;
 }
 
-int readlink_and_make_absolute_root(const char *root, const char *path, char **ret) {
-        _cleanup_free_ char *target = NULL, *t = NULL;
-        const char *full;
-        int r;
-
-        full = prefix_roota(root, path);
-        r = readlink_malloc(full, &target);
-        if (r < 0)
-                return r;
-
-        t = file_in_same_dir(path, target);
-        if (!t)
-                return -ENOMEM;
-
-        *ret = t;
-        t = NULL;
-
-        return 0;
-}
-
 int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {
         assert(path);
 
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index c4b81858fdc..6df3ebffe29 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -41,7 +41,6 @@ int readlinkat_malloc(int fd, const char *p, char **ret);
 int readlink_malloc(const char *p, char **r);
 int readlink_value(const char *p, char **ret);
 int readlink_and_make_absolute(const char *p, char **r);
-int readlink_and_make_absolute_root(const char *root, const char *path, char **ret);
 
 int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid);