# HG changeset patch # User Paul Boddie # Date 1615759163 -3600 # Node ID 1bfcaf212f610eeed6786073cfb09f021bc59938 # Parent 2c9031777e1e71ee0051826df7c68c4ae4423798 Switched to using the flags type throughout. diff -r 2c9031777e1e -r 1bfcaf212f61 file_pager.cc --- a/file_pager.cc Sun Mar 14 21:41:49 2021 +0100 +++ b/file_pager.cc Sun Mar 14 22:59:23 2021 +0100 @@ -4,7 +4,7 @@ /* Initialise a pager for a file with a unique file identifier and shared page mapper for moderating access to loaded pages. */ -FilePager::FilePager(fileid_t fileid, PageMapper *mapper, int flags) +FilePager::FilePager(fileid_t fileid, PageMapper *mapper, flags_t flags) : Pager(mapper, flags), fileid(fileid) { } @@ -35,7 +35,7 @@ return L4_EOK; } -long FilePager::map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region) +long FilePager::map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region) { return Pager::map(offset, hot_spot, flags, region); } diff -r 2c9031777e1e -r 1bfcaf212f61 file_pager.h --- a/file_pager.h Sun Mar 14 21:41:49 2021 +0100 +++ b/file_pager.h Sun Mar 14 22:59:23 2021 +0100 @@ -10,7 +10,7 @@ public: fileid_t fileid; - explicit FilePager(fileid_t fileid, PageMapper *mapper, int flags); + explicit FilePager(fileid_t fileid, PageMapper *mapper, flags_t flags); /* Server details. */ @@ -23,7 +23,7 @@ /* Pager and mapped file methods. */ - virtual long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region); + virtual long map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region); virtual long mmap(offset_t position, offset_t length, offset_t *start_pos, offset_t *end_pos, offset_t *data_end); }; diff -r 2c9031777e1e -r 1bfcaf212f61 opener_context_resource.cc --- a/opener_context_resource.cc Sun Mar 14 21:41:49 2021 +0100 +++ b/opener_context_resource.cc Sun Mar 14 22:59:23 2021 +0100 @@ -45,7 +45,7 @@ /* Opener context interface methods. */ -long OpenerContextResource::open(int flags, size_t *size, l4_cap_idx_t *file) +long OpenerContextResource::open(flags_t flags, size_t *size, l4_cap_idx_t *file) { char *path = get_path(); diff -r 2c9031777e1e -r 1bfcaf212f61 opener_context_resource.h --- a/opener_context_resource.h Sun Mar 14 21:41:49 2021 +0100 +++ b/opener_context_resource.h Sun Mar 14 22:59:23 2021 +0100 @@ -36,11 +36,11 @@ /* Opener context interface methods. */ - long open(int flags, size_t *size, l4_cap_idx_t *file); + long open(flags_t flags, size_t *size, l4_cap_idx_t *file); /* Pager/dataspace methods. */ - long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, + long map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region) { return SimplePager::map(offset, hot_spot, flags, region); } diff -r 2c9031777e1e -r 1bfcaf212f61 opener_resource.cc --- a/opener_resource.cc Sun Mar 14 21:41:49 2021 +0100 +++ b/opener_resource.cc Sun Mar 14 22:59:23 2021 +0100 @@ -23,7 +23,7 @@ /* Return a pager object for the given path and flags. */ -FilePager *OpenerResource::open(const char *path, int flags) +FilePager *OpenerResource::open(const char *path, flags_t flags) { fileid_t fileid = get_fileid(path); diff -r 2c9031777e1e -r 1bfcaf212f61 opener_resource.h --- a/opener_resource.h Sun Mar 14 21:41:49 2021 +0100 +++ b/opener_resource.h Sun Mar 14 22:59:23 2021 +0100 @@ -46,7 +46,7 @@ /* Direct access methods. */ - FilePager *open(const char *path, int flags); + FilePager *open(const char *path, flags_t flags); /* Opener interface methods. */ diff -r 2c9031777e1e -r 1bfcaf212f61 pager.cc --- a/pager.cc Sun Mar 14 21:41:49 2021 +0100 +++ b/pager.cc Sun Mar 14 22:59:23 2021 +0100 @@ -4,7 +4,7 @@ -Pager::Pager(PageMapper *mapper, int flags) +Pager::Pager(PageMapper *mapper, unsigned long flags) : _start(0), _size(0), _mapper(mapper), _flags(flags) { _mapper->attach(); diff -r 2c9031777e1e -r 1bfcaf212f61 pager.h --- a/pager.h Sun Mar 14 21:41:49 2021 +0100 +++ b/pager.h Sun Mar 14 22:59:23 2021 +0100 @@ -14,10 +14,10 @@ protected: offset_t _start, _size; PageMapper *_mapper; - int _flags; + unsigned long _flags; public: - explicit Pager(PageMapper *mapper, int flags); + explicit Pager(PageMapper *mapper, unsigned long flags); virtual void close();