From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 13 Oct 2024 03:07:25 +0000 (+0900)
Subject: fs-util: make readlink_malloc() inline
X-Git-Tag: v257-rc1~216^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=28b9c823c7b488b00f0faf30ab7c8930241c881f;p=thirdparty%2Fsystemd.git

fs-util: make readlink_malloc() inline
---

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index a6b53e7067c..9292e567c87 100644
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -153,10 +153,6 @@ int readlinkat_malloc(int fd, const char *p, char **ret) {
         }
 }
 
-int readlink_malloc(const char *p, char **ret) {
-        return readlinkat_malloc(AT_FDCWD, p, ret);
-}
-
 int readlink_value(const char *p, char **ret) {
         _cleanup_free_ char *link = NULL, *name = NULL;
         int r;
diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h
index 82e865180b9..702b6010e2a 100644
--- a/src/basic/fs-util.h
+++ b/src/basic/fs-util.h
@@ -28,9 +28,11 @@ int rmdir_parents(const char *path, const char *stop);
 int rename_noreplace(int olddirfd, const char *oldpath, int newdirfd, const char *newpath);
 
 int readlinkat_malloc(int fd, const char *p, char **ret);
-int readlink_malloc(const char *p, char **r);
+static inline int readlink_malloc(const char *p, char **ret) {
+        return readlinkat_malloc(AT_FDCWD, p, ret);
+}
 int readlink_value(const char *p, char **ret);
-int readlink_and_make_absolute(const char *p, char **r);
+int readlink_and_make_absolute(const char *p, char **ret);
 
 int chmod_and_chown_at(int dir_fd, const char *path, mode_t mode, uid_t uid, gid_t gid);
 static inline int chmod_and_chown(const char *path, mode_t mode, uid_t uid, gid_t gid) {