Common base for mappers

2 files changed, 5 insertions, 39 deletions

diff --git a/netfs/fuse/fuseMappersImpl.cpp b/netfs/fuse/fuseMappersImpl.cpp
index 4aa2789..5bde752 100644
--- a/netfs/fuse/fuseMappersImpl.cpp
+++ b/netfs/fuse/fuseMappersImpl.cpp
@@ -5,18 +5,6 @@ namespace NetFS::Client {
 	constexpr int MASK_EVERYTHING = ~0;
 	static_assert(MASK_EVERYTHING == static_cast<int>(0xFFFFFFFF));
 
-	HideUnknownMapperImpl::HideUnknownMapperImpl() : HideUnknownMapperImpl(std::make_shared<UserEntCache>()) { }
-
-	HideUnknownMapperImpl::HideUnknownMapperImpl(EntryResolverPtr<User> u) :
-		HideUnknownMapperImpl(std::move(u), std::make_shared<GroupEntCache>(u))
-	{
-	}
-
-	HideUnknownMapperImpl::HideUnknownMapperImpl(EntryResolverPtr<User> u, EntryResolverPtr<Group> g) :
-		users(std::move(u)), groups(std::move(g))
-	{
-	}
-
 	Mapping::FileSystem
 	HideUnknownMapperImpl::mapTransport(const std::string & un, const std::string & gn)
 	{
@@ -38,17 +26,6 @@ namespace NetFS::Client {
 		}
 		return {u->name, g->name, 0};
 	}
-	MaskUnknownMapperImpl::MaskUnknownMapperImpl() : MaskUnknownMapperImpl(std::make_shared<UserEntCache>()) { }
-
-	MaskUnknownMapperImpl::MaskUnknownMapperImpl(EntryResolverPtr<User> u) :
-		MaskUnknownMapperImpl(std::move(u), std::make_shared<GroupEntCache>(u))
-	{
-	}
-
-	MaskUnknownMapperImpl::MaskUnknownMapperImpl(EntryResolverPtr<User> u, EntryResolverPtr<Group> g) :
-		users(std::move(u)), groups(std::move(g))
-	{
-	}
 
 	Mapping::FileSystem
 	MaskUnknownMapperImpl::mapTransport(const std::string & un, const std::string & gn)
diff --git a/netfs/fuse/fuseMappersImpl.h b/netfs/fuse/fuseMappersImpl.h
index 41d78b8..2bcf579 100644
--- a/netfs/fuse/fuseMappersImpl.h
+++ b/netfs/fuse/fuseMappersImpl.h
@@ -1,6 +1,7 @@
 #ifndef NETFS_MAPPING_CLIENTIMPL_H
 #define NETFS_MAPPING_CLIENTIMPL_H
 
+#include "baseMapper.h"
 #include "entries.h"
 #include "entryResolver.h"
 #include <fuseMappers.h>
@@ -8,32 +9,20 @@
 
 namespace NetFS {
 	namespace Client {
-		class DLL_PUBLIC HideUnknownMapperImpl : public HideUnknownMapper {
+		class DLL_PUBLIC HideUnknownMapperImpl : public HideUnknownMapper, Mapping::BaseMapper {
 		public:
-			HideUnknownMapperImpl();
-			HideUnknownMapperImpl(EntryResolverPtr<User> u);
-			HideUnknownMapperImpl(EntryResolverPtr<User> u, EntryResolverPtr<Group> g);
+			using BaseMapper::BaseMapper;
 
 			Mapping::Transport mapFileSystem(int uid, int gid) override;
 			Mapping::FileSystem mapTransport(const std::string & un, const std::string & gn) override;
-
-		protected:
-			EntryResolverPtr<User> users;
-			EntryResolverPtr<Group> groups;
 		};
 
-		class DLL_PUBLIC MaskUnknownMapperImpl : public MaskUnknownMapper {
+		class DLL_PUBLIC MaskUnknownMapperImpl : public MaskUnknownMapper, Mapping::BaseMapper {
 		public:
-			MaskUnknownMapperImpl();
-			MaskUnknownMapperImpl(EntryResolverPtr<User> u);
-			MaskUnknownMapperImpl(EntryResolverPtr<User> u, EntryResolverPtr<Group> g);
+			using BaseMapper::BaseMapper;
 
 			Mapping::Transport mapFileSystem(int uid, int gid) override;
 			Mapping::FileSystem mapTransport(const std::string & un, const std::string & gn) override;
-
-		protected:
-			EntryResolverPtr<User> users;
-			EntryResolverPtr<Group> groups;
 		};
 	}
 }