From abfbd55305587306730d5419b8a3b09e6a43abcb Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 17 Oct 2013 21:59:35 +0200 Subject: 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. --- src/fs/DirectoryReader.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/fs/DirectoryReader.hxx') diff --git a/src/fs/DirectoryReader.hxx b/src/fs/DirectoryReader.hxx index 4e4a56345..c9d2c04b8 100644 --- a/src/fs/DirectoryReader.hxx +++ b/src/fs/DirectoryReader.hxx @@ -21,7 +21,7 @@ #define MPD_FS_DIRECTORY_READER_HXX #include "check.h" -#include "Path.hxx" +#include "AllocatedPath.hxx" #include @@ -35,7 +35,7 @@ public: /** * Creates new directory reader for the specified #dir. */ - explicit DirectoryReader(const Path &dir) + explicit DirectoryReader(Path dir) : dirp(opendir(dir.c_str())), ent(nullptr) { } @@ -78,9 +78,9 @@ public: /** * Extracts directory entry that was previously read by #ReadEntry. */ - Path GetEntry() const { + AllocatedPath GetEntry() const { assert(HasEntry()); - return Path::FromFS(ent->d_name); + return AllocatedPath::FromFS(ent->d_name); } }; -- cgit v1.2.3