1.1 --- a/files/opener_resource.cc Wed Mar 31 01:06:22 2021 +0200
1.2 +++ b/files/opener_resource.cc Wed Mar 31 23:54:51 2021 +0200
1.3 @@ -4,8 +4,8 @@
1.4
1.5 /* Support for providing access to files. */
1.6
1.7 -OpenerResource::OpenerResource(Paging *paging, Pages *pages)
1.8 -: _paging(paging), _pages(pages)
1.9 +OpenerResource::OpenerResource(Pages *pages)
1.10 +: Paging(pages)
1.11 {
1.12 }
1.13
1.14 @@ -23,34 +23,14 @@
1.15
1.16 /* Return a pager object for the given path and flags. */
1.17
1.18 -FilePager *OpenerResource::open(const char *path, flags_t flags)
1.19 +Pager *OpenerResource::open(const char *path, flags_t flags)
1.20 {
1.21 fileid_t fileid = get_fileid(path);
1.22
1.23 if (fileid == FILEID_INVALID)
1.24 return NULL;
1.25
1.26 - PageMapper *mapper = get_mapper(fileid);
1.27 - return new FilePager(fileid, mapper, flags);
1.28 -}
1.29 -
1.30 -/* Obtain a page mapper for the 'fileid' or register a new one in the
1.31 - paging object. */
1.32 -
1.33 -PageMapper *OpenerResource::get_mapper(fileid_t fileid)
1.34 -{
1.35 - PageMapper *mapper;
1.36 -
1.37 - if (_paging->reserve(fileid))
1.38 - mapper = _paging->get(fileid);
1.39 - else
1.40 - {
1.41 - Accessor *accessor = make_accessor(fileid);
1.42 - mapper = new PageMapper(accessor, _pages);
1.43 - _paging->set(fileid, mapper);
1.44 - }
1.45 -
1.46 - return mapper;
1.47 + return get_pager(fileid, flags);
1.48 }
1.49
1.50