diff options
author | Max Kellermann <max@duempel.org> | 2013-10-17 21:59:35 +0200 |
---|---|---|
committer | Max Kellermann <max@duempel.org> | 2013-10-17 23:43:46 +0200 |
commit | abfbd55305587306730d5419b8a3b09e6a43abcb (patch) | |
tree | 2a195220d79efe195f3beacb7dd3a226a3341ad6 /src/fs/FileSystem.cxx | |
parent | b3611524f45c2a478f9decd6d22ecd1dbbbb64b9 (diff) | |
download | mpd-abfbd55305587306730d5419b8a3b09e6a43abcb.tar.gz mpd-abfbd55305587306730d5419b8a3b09e6a43abcb.tar.xz mpd-abfbd55305587306730d5419b8a3b09e6a43abcb.zip |
fs/Path: rename to AllocatedPath
The new class Path only holds a string pointer without being
responsible for allocation/deallocation. The FileSystem.hxx library
accepts Path arguments instead of AllocatedPath, to avoid forcing
callers to allocate another string object.
Diffstat (limited to 'src/fs/FileSystem.cxx')
-rw-r--r-- | src/fs/FileSystem.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/fs/FileSystem.cxx b/src/fs/FileSystem.cxx index 7f740e3af..4cd9f33b2 100644 --- a/src/fs/FileSystem.cxx +++ b/src/fs/FileSystem.cxx @@ -19,26 +19,28 @@ #include "config.h" #include "FileSystem.hxx" +#include "AllocatedPath.hxx" #include "Limits.hxx" #include <errno.h> -Path ReadLink(const Path &path) +AllocatedPath +ReadLink(Path path) { #ifdef WIN32 (void)path; errno = EINVAL; - return Path::Null(); + return AllocatedPath::Null(); #else char buffer[MPD_PATH_MAX]; ssize_t size = readlink(path.c_str(), buffer, MPD_PATH_MAX); if (size < 0) - return Path::Null(); + return AllocatedPath::Null(); if (size_t(size) >= MPD_PATH_MAX) { errno = ENOMEM; - return Path::Null(); + return AllocatedPath::Null(); } buffer[size] = '\0'; - return Path::FromFS(buffer); + return AllocatedPath::FromFS(buffer); #endif } |