oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

archive/Lookup: pass const pointer

Browse Source
This commit is contained in:
Max Kellermann
2019-06-15 13:59:22 +02:00
parent 17f207ffd1
commit be79b44dc8
4 changed files with 16 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/archive/ArchiveLookup.cxx
View File

@@ -35,16 +35,17 @@ FindSlash(PathTraitsFS::pointer_type p, size_t i) noexcept
}
ArchiveLookupResult
archive_lookup(PathTraitsFS::pointer_type pathname)
archive_lookup(PathTraitsFS::const_pointer_type pathname)
{
size_t idx = strlen(pathname);
PathTraitsFS::string buffer(pathname);
size_t idx = buffer.size();
PathTraitsFS::pointer_type slash = nullptr;
while (true) {
try {
//try to stat if its real directory
const FileInfo file_info(Path::FromFS(pathname));
const FileInfo file_info(Path::FromFS(buffer.c_str()));
//is something found ins original path (is not an archive)
if (slash == nullptr)
@@ -53,7 +54,7 @@ archive_lookup(PathTraitsFS::pointer_type pathname)
//its a file ?
if (file_info.IsRegular()) {
//so the upper should be file
return {AllocatedPath::FromFS(pathname), AllocatedPath::FromFS(slash + 1)};
return {AllocatedPath::FromFS(buffer.c_str()), AllocatedPath::FromFS(slash + 1)};
} else {
return {};
}
@@ -66,12 +67,12 @@ archive_lookup(PathTraitsFS::pointer_type pathname)
if (slash != nullptr)
*slash = '/';
slash = FindSlash(pathname, idx - 1);
slash = FindSlash(&buffer.front(), idx - 1);
if (slash == nullptr)
return {};
*slash = 0;
idx = slash - pathname;
idx = slash - buffer.c_str();
}
}

2
src/archive/ArchiveLookup.hxx
View File

@@ -50,7 +50,7 @@ struct ArchiveLookupResult {
* Throws on error.
*/
ArchiveLookupResult
archive_lookup(PathTraitsFS::pointer_type pathname);
archive_lookup(PathTraitsFS::const_pointer_type pathname);
#endif