1.1 --- a/file_pager.cc Sun Mar 14 21:41:49 2021 +0100
1.2 +++ b/file_pager.cc Sun Mar 14 22:59:23 2021 +0100
1.3 @@ -4,7 +4,7 @@
1.4 /* Initialise a pager for a file with a unique file identifier and shared page
1.5 mapper for moderating access to loaded pages. */
1.6
1.7 -FilePager::FilePager(fileid_t fileid, PageMapper *mapper, int flags)
1.8 +FilePager::FilePager(fileid_t fileid, PageMapper *mapper, flags_t flags)
1.9 : Pager(mapper, flags), fileid(fileid)
1.10 {
1.11 }
1.12 @@ -35,7 +35,7 @@
1.13 return L4_EOK;
1.14 }
1.15
1.16 -long FilePager::map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region)
1.17 +long FilePager::map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region)
1.18 {
1.19 return Pager::map(offset, hot_spot, flags, region);
1.20 }
2.1 --- a/file_pager.h Sun Mar 14 21:41:49 2021 +0100
2.2 +++ b/file_pager.h Sun Mar 14 22:59:23 2021 +0100
2.3 @@ -10,7 +10,7 @@
2.4 public:
2.5 fileid_t fileid;
2.6
2.7 - explicit FilePager(fileid_t fileid, PageMapper *mapper, int flags);
2.8 + explicit FilePager(fileid_t fileid, PageMapper *mapper, flags_t flags);
2.9
2.10 /* Server details. */
2.11
2.12 @@ -23,7 +23,7 @@
2.13
2.14 /* Pager and mapped file methods. */
2.15
2.16 - virtual long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags, l4_snd_fpage_t *region);
2.17 + virtual long map(unsigned long offset, l4_addr_t hot_spot, flags_t flags, l4_snd_fpage_t *region);
2.18
2.19 virtual long mmap(offset_t position, offset_t length, offset_t *start_pos, offset_t *end_pos, offset_t *data_end);
2.20 };
3.1 --- a/opener_context_resource.cc Sun Mar 14 21:41:49 2021 +0100
3.2 +++ b/opener_context_resource.cc Sun Mar 14 22:59:23 2021 +0100
3.3 @@ -45,7 +45,7 @@
3.4
3.5 /* Opener context interface methods. */
3.6
3.7 -long OpenerContextResource::open(int flags, size_t *size, l4_cap_idx_t *file)
3.8 +long OpenerContextResource::open(flags_t flags, size_t *size, l4_cap_idx_t *file)
3.9 {
3.10 char *path = get_path();
3.11
4.1 --- a/opener_context_resource.h Sun Mar 14 21:41:49 2021 +0100
4.2 +++ b/opener_context_resource.h Sun Mar 14 22:59:23 2021 +0100
4.3 @@ -36,11 +36,11 @@
4.4
4.5 /* Opener context interface methods. */
4.6
4.7 - long open(int flags, size_t *size, l4_cap_idx_t *file);
4.8 + long open(flags_t flags, size_t *size, l4_cap_idx_t *file);
4.9
4.10 /* Pager/dataspace methods. */
4.11
4.12 - long map(unsigned long offset, l4_addr_t hot_spot, unsigned long flags,
4.13 + long map(unsigned long offset, l4_addr_t hot_spot, flags_t flags,
4.14 l4_snd_fpage_t *region)
4.15 { return SimplePager::map(offset, hot_spot, flags, region); }
4.16
5.1 --- a/opener_resource.cc Sun Mar 14 21:41:49 2021 +0100
5.2 +++ b/opener_resource.cc Sun Mar 14 22:59:23 2021 +0100
5.3 @@ -23,7 +23,7 @@
5.4
5.5 /* Return a pager object for the given path and flags. */
5.6
5.7 -FilePager *OpenerResource::open(const char *path, int flags)
5.8 +FilePager *OpenerResource::open(const char *path, flags_t flags)
5.9 {
5.10 fileid_t fileid = get_fileid(path);
5.11
6.1 --- a/opener_resource.h Sun Mar 14 21:41:49 2021 +0100
6.2 +++ b/opener_resource.h Sun Mar 14 22:59:23 2021 +0100
6.3 @@ -46,7 +46,7 @@
6.4
6.5 /* Direct access methods. */
6.6
6.7 - FilePager *open(const char *path, int flags);
6.8 + FilePager *open(const char *path, flags_t flags);
6.9
6.10 /* Opener interface methods. */
6.11
7.1 --- a/pager.cc Sun Mar 14 21:41:49 2021 +0100
7.2 +++ b/pager.cc Sun Mar 14 22:59:23 2021 +0100
7.3 @@ -4,7 +4,7 @@
7.4
7.5
7.6
7.7 -Pager::Pager(PageMapper *mapper, int flags)
7.8 +Pager::Pager(PageMapper *mapper, unsigned long flags)
7.9 : _start(0), _size(0), _mapper(mapper), _flags(flags)
7.10 {
7.11 _mapper->attach();
8.1 --- a/pager.h Sun Mar 14 21:41:49 2021 +0100
8.2 +++ b/pager.h Sun Mar 14 22:59:23 2021 +0100
8.3 @@ -14,10 +14,10 @@
8.4 protected:
8.5 offset_t _start, _size;
8.6 PageMapper *_mapper;
8.7 - int _flags;
8.8 + unsigned long _flags;
8.9
8.10 public:
8.11 - explicit Pager(PageMapper *mapper, int flags);
8.12 + explicit Pager(PageMapper *mapper, unsigned long flags);
8.13
8.14 virtual void close();
8.15