archive/Lookup: move to fs/LookupFile.cxx

This can be used for other purposes as well.
This commit is contained in:
Max Kellermann
2019-06-15 14:26:26 +02:00
parent fcf6415963
commit bd6b7aa88e
8 changed files with 43 additions and 53 deletions

View File

@@ -18,11 +18,11 @@
*/
#include "ArchiveInputPlugin.hxx"
#include "archive/ArchiveLookup.hxx"
#include "archive/ArchiveList.hxx"
#include "archive/ArchivePlugin.hxx"
#include "archive/ArchiveFile.hxx"
#include "../InputStream.hxx"
#include "fs/LookupFile.hxx"
#include "fs/Path.hxx"
#include "Log.hxx"
@@ -31,10 +31,9 @@ OpenArchiveInputStream(Path path, Mutex &mutex)
{
const ArchivePlugin *arplug;
// archive_lookup will modify pname when true is returned
ArchiveLookupResult l;
try {
l = archive_lookup(path);
l = LookupFile(path);
if (l.archive.IsNull()) {
return nullptr;
}