Link: port to new ethtool ETHTOOL_xLINKSETTINGS

[elogind.git] / src / basic / fs-util.c

diff --git a/src/basic/fs-util.c b/src/basic/fs-util.c
index 55f606cebc23d223150d44d427dd82c9dad83754..f288848c9e8f7d52c50e2ab376d9760be37f5863 100644 (file)
--- a/src/basic/fs-util.c
+++ b/src/basic/fs-util.c
@@ -602,7 +602,6 @@ int inotify_add_watch_fd(int fd, int what, uint32_t mask) {
 
         return r;
 }
-#endif // 0
 
 int chase_symlinks(const char *path, const char *_root, char **ret) {
         _cleanup_free_ char *buffer = NULL, *done = NULL, *root = NULL;
@@ -748,7 +747,7 @@ int chase_symlinks(const char *path, const char *_root, char **ret) {
                                 /* A relative destination. If so, this is what we'll prefix what's left to do with what
                                  * we just read, and start the loop again, but remain in the current directory. */
 
-                                joined = strjoin("/", destination, todo, NULL);
+                                joined = strjoin("/", destination, todo);
                                 if (!joined)
                                         return -ENOMEM;
 
@@ -786,3 +785,4 @@ int chase_symlinks(const char *path, const char *_root, char **ret) {
 
         return 0;
 }
+#endif // 0