From 33b038e8a7472cf93e39407fff912236f33d5663 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 11 Feb 2022 15:11:03 +0100 Subject: [PATCH] Consistent spelling of "writeable" Fixes #4425 --- repos/base-foc/src/core/vm_session_component.cc | 2 +- repos/base-hw/src/core/core_region_map.cc | 2 +- .../src/core/include/dataspace_component.h | 14 +++++++------- repos/base-linux/src/core/platform.cc | 4 ++-- .../src/core/spec/linux/dataspace_component.cc | 4 ++-- .../src/core/spec/pc/dataspace_component.cc | 6 +++--- .../src/include/base/internal/region_map_mmap.h | 6 +++--- .../src/include/linux_dataspace/client.h | 4 ++-- repos/base-linux/src/lib/base/platform_env.cc | 4 ++-- repos/base-linux/src/lib/base/region_map_mmap.cc | 6 +++--- repos/base-nova/src/core/core_region_map.cc | 2 +- repos/base-nova/src/core/vm_session_component.cc | 2 +- .../src/core/spec/x86/vm_session_component.cc | 2 +- repos/base/include/dataspace/client.h | 4 ++-- repos/base/include/dataspace/dataspace.h | 10 +++++----- .../base/src/core/include/dataspace_component.h | 16 ++++++++-------- repos/base/src/core/region_map_component.cc | 4 ++-- repos/base/src/core/vm_session_common.cc | 2 +- .../base/src/include/base/internal/elf_format.h | 2 +- repos/base/src/lib/ldso/include/elf.h | 2 +- repos/dde_rump/src/include/util/random.h | 4 ++-- repos/dde_rump/src/lib/rump/io.cc | 6 +++--- repos/gems/recipes/pkg/sculpt/README | 4 ++-- .../src/app/sculpt_manager/runtime/chroot.cc | 4 ++-- .../os/include/file_system_session/connection.h | 2 +- .../os/src/drivers/uart/spec/pbxa9/uart_driver.h | 2 +- repos/os/src/server/lx_fs/main.cc | 14 +++++++------- repos/ports/run/virtualbox_auto.inc | 6 +++--- 28 files changed, 70 insertions(+), 70 deletions(-) diff --git a/repos/base-foc/src/core/vm_session_component.cc b/repos/base-foc/src/core/vm_session_component.cc index a8f88bb112..f38f72fe4c 100644 --- a/repos/base-foc/src/core/vm_session_component.cc +++ b/repos/base-foc/src/core/vm_session_component.cc @@ -176,7 +176,7 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc, using namespace Foc; uint8_t flags = L4_FPAGE_RO; - if (dsc.writable() && attribute.writeable) + if (dsc.writeable() && attribute.writeable) if (attribute.executable) flags = L4_FPAGE_RWX; else diff --git a/repos/base-hw/src/core/core_region_map.cc b/repos/base-hw/src/core/core_region_map.cc index f5cc4f9ed3..0ceb40217e 100644 --- a/repos/base-hw/src/core/core_region_map.cc +++ b/repos/base-hw/src/core/core_region_map.cc @@ -67,7 +67,7 @@ Core_region_map::attach(Dataspace_capability ds_cap, size_t size, /* map the dataspace's physical pages to corresponding virtual addresses */ unsigned num_pages = (unsigned)(page_rounded_size >> get_page_size_log2()); - Page_flags const flags { (writeable && ds.writable()) ? RW : RO, + Page_flags const flags { (writeable && ds.writeable()) ? RW : RO, NO_EXEC, KERN, GLOBAL, ds.io_mem() ? DEVICE : RAM, ds.cacheability() }; diff --git a/repos/base-linux/src/core/include/dataspace_component.h b/repos/base-linux/src/core/include/dataspace_component.h index 1a8fb1ab6e..a49e42eafc 100644 --- a/repos/base-linux/src/core/include/dataspace_component.h +++ b/repos/base-linux/src/core/include/dataspace_component.h @@ -47,7 +47,7 @@ class Genode::Dataspace_component : public Rpc_object size_t const _size; /* size of dataspace in bytes */ addr_t const _addr; /* meaningless on linux */ Native_capability _cap; /* capability / file descriptor */ - bool const _writable; /* false if read-only */ + bool const _writeable; /* false if read-only */ /* * Holds the dataspace owner if a distinction between owner and @@ -74,10 +74,10 @@ class Genode::Dataspace_component : public Rpc_object /** * Constructor */ - Dataspace_component(size_t size, addr_t addr, Cache, bool writable, + Dataspace_component(size_t size, addr_t addr, Cache, bool writeable, Dataspace_owner * owner) : - _size(size), _addr(addr), _cap(), _writable(writable), _owner(owner) + _size(size), _addr(addr), _cap(), _writeable(writeable), _owner(owner) { } /** @@ -85,7 +85,7 @@ class Genode::Dataspace_component : public Rpc_object */ Dataspace_component() : - _size(0), _addr(0), _cap(), _writable(false), _owner(nullptr) + _size(0), _addr(0), _cap(), _writeable(false), _owner(nullptr) { } /** @@ -93,7 +93,7 @@ class Genode::Dataspace_component : public Rpc_object * reasons and should not be used. */ Dataspace_component(size_t size, addr_t, addr_t phys_addr, - Cache, bool writable, Dataspace_owner *_owner); + Cache, bool writeable, Dataspace_owner *_owner); /** * This constructor is especially used for ROM dataspaces @@ -127,8 +127,8 @@ class Genode::Dataspace_component : public Rpc_object ** Dataspace interface ** *************************/ - size_t size() override { return _size; } - bool writable() override { return _writable; } + size_t size() override { return _size; } + bool writeable() override { return _writeable; } /**************************************** diff --git a/repos/base-linux/src/core/platform.cc b/repos/base-linux/src/core/platform.cc index 209962432e..da2251bc69 100644 --- a/repos/base-linux/src/core/platform.cc +++ b/repos/base-linux/src/core/platform.cc @@ -187,8 +187,8 @@ int Region_map_mmap::_dataspace_fd(Capability ds_cap) } -bool Region_map_mmap::_dataspace_writable(Dataspace_capability ds_cap) +bool Region_map_mmap::_dataspace_writeable(Dataspace_capability ds_cap) { return core_env().entrypoint().apply(ds_cap, [] (Dataspace *ds) { - return ds ? ds->writable() : false; }); + return ds ? ds->writeable() : false; }); } diff --git a/repos/base-linux/src/core/spec/linux/dataspace_component.cc b/repos/base-linux/src/core/spec/linux/dataspace_component.cc index 045971f067..a869e4a12e 100644 --- a/repos/base-linux/src/core/spec/linux/dataspace_component.cc +++ b/repos/base-linux/src/core/spec/linux/dataspace_component.cc @@ -68,7 +68,7 @@ Dataspace_component::Dataspace_component(const char *args) _size(_file_size()), _addr(0), _cap(_fd_to_cap(lx_open(_fname.buf, O_RDONLY | LX_O_CLOEXEC, S_IRUSR | S_IXUSR))), - _writable(false), + _writeable(false), _owner(0) { } @@ -76,7 +76,7 @@ Dataspace_component::Dataspace_component(const char *args) Dataspace_component::Dataspace_component(size_t size, addr_t, addr_t phys_addr, Cache, bool, Dataspace_owner *_owner) : - _size(size), _addr(phys_addr), _cap(), _writable(false), _owner(_owner) + _size(size), _addr(phys_addr), _cap(), _writeable(false), _owner(_owner) { warning("Should only be used for IOMEM and not within Linux."); _fname.buf[0] = 0; diff --git a/repos/base-linux/src/core/spec/pc/dataspace_component.cc b/repos/base-linux/src/core/spec/pc/dataspace_component.cc index 02df2925e3..762e388be2 100644 --- a/repos/base-linux/src/core/spec/pc/dataspace_component.cc +++ b/repos/base-linux/src/core/spec/pc/dataspace_component.cc @@ -67,15 +67,15 @@ Dataspace_component::Dataspace_component(const char *args) _size(_file_size()), _addr(0), _cap(_fd_to_cap(lx_open(_fname.buf, O_RDONLY | LX_O_CLOEXEC, S_IRUSR | S_IXUSR))), - _writable(false), + _writeable(false), _owner(0) { } Dataspace_component::Dataspace_component(size_t size, addr_t, addr_t phys_addr, - Cache, bool writable, Dataspace_owner *_owner) + Cache, bool writeable, Dataspace_owner *_owner) : - _size(size), _addr(phys_addr), _cap(), _writable(writable), _owner(_owner) + _size(size), _addr(phys_addr), _cap(), _writeable(writeable), _owner(_owner) { _fname.buf[0] = 0; } diff --git a/repos/base-linux/src/include/base/internal/region_map_mmap.h b/repos/base-linux/src/include/base/internal/region_map_mmap.h index 9d1690bb25..b723ea622f 100644 --- a/repos/base-linux/src/include/base/internal/region_map_mmap.h +++ b/repos/base-linux/src/include/base/internal/region_map_mmap.h @@ -97,9 +97,9 @@ class Genode::Region_map_mmap : public Region_map, public Dataspace int _dataspace_fd(Capability); /** - * Determine whether dataspace is writable + * Determine whether dataspace is writeable */ - bool _dataspace_writable(Capability); + bool _dataspace_writeable(Capability); public: @@ -134,7 +134,7 @@ class Genode::Region_map_mmap : public Region_map, public Dataspace size_t size() override { return _size; } - bool writable() override { return true; } + bool writeable() override { return true; } /** * Return pseudo dataspace capability of the RM session diff --git a/repos/base-linux/src/include/linux_dataspace/client.h b/repos/base-linux/src/include/linux_dataspace/client.h index cc66d9008f..2ba5274b5e 100644 --- a/repos/base-linux/src/include/linux_dataspace/client.h +++ b/repos/base-linux/src/include/linux_dataspace/client.h @@ -32,8 +32,8 @@ struct Genode::Linux_dataspace_client : Rpc_client ** Generic dataspace interface ** *********************************/ - size_t size() override { return call(); } - bool writable() override { return call(); } + size_t size() override { return call(); } + bool writeable() override { return call(); } /**************************************** diff --git a/repos/base-linux/src/lib/base/platform_env.cc b/repos/base-linux/src/lib/base/platform_env.cc index 5e02235809..7e8a8d03e2 100644 --- a/repos/base-linux/src/lib/base/platform_env.cc +++ b/repos/base-linux/src/lib/base/platform_env.cc @@ -48,9 +48,9 @@ int Region_map_mmap::_dataspace_fd(Dataspace_capability ds) } -bool Region_map_mmap::_dataspace_writable(Dataspace_capability ds) +bool Region_map_mmap::_dataspace_writeable(Dataspace_capability ds) { - return Dataspace_client(ds).writable(); + return Dataspace_client(ds).writeable(); } diff --git a/repos/base-linux/src/lib/base/region_map_mmap.cc b/repos/base-linux/src/lib/base/region_map_mmap.cc index 870baaa29b..01946e4204 100644 --- a/repos/base-linux/src/lib/base/region_map_mmap.cc +++ b/repos/base-linux/src/lib/base/region_map_mmap.cc @@ -129,12 +129,12 @@ void *Region_map_mmap::_map_local(Dataspace_capability ds, bool overmap, bool writeable) { - int const fd = _dataspace_fd(ds); - bool const writable = _dataspace_writable(ds) && writeable; + writeable = _dataspace_writeable(ds) && writeable; + int const fd = _dataspace_fd(ds); int const flags = MAP_SHARED | (overmap ? MAP_FIXED : 0); int const prot = PROT_READ - | (writable ? PROT_WRITE : 0) + | (writeable ? PROT_WRITE : 0) | (executable ? PROT_EXEC : 0); void * const addr_in = use_local_addr ? (void*)local_addr : 0; void * const addr_out = lx_mmap(addr_in, size, prot, flags, fd, offset); diff --git a/repos/base-nova/src/core/core_region_map.cc b/repos/base-nova/src/core/core_region_map.cc index bf6080e62a..7bacb30091 100644 --- a/repos/base-nova/src/core/core_region_map.cc +++ b/repos/base-nova/src/core/core_region_map.cc @@ -82,7 +82,7 @@ Core_region_map::attach(Dataspace_capability ds_cap, size_t, /* map it */ Nova::Utcb &utcb = *reinterpret_cast(Thread::myself()->utcb()); - const Nova::Rights rights(true, writeable && ds.writable(), executable); + const Nova::Rights rights(true, writeable && ds.writeable(), executable); if (map_local(platform_specific().core_pd_sel(), utcb, ds.phys_addr(), reinterpret_cast(virt_ptr), diff --git a/repos/base-nova/src/core/vm_session_component.cc b/repos/base-nova/src/core/vm_session_component.cc index e269939c92..32195e4fc3 100644 --- a/repos/base-nova/src/core/vm_session_component.cc +++ b/repos/base-nova/src/core/vm_session_component.cc @@ -257,7 +257,7 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc, Flexpage page = flex.page(); while (page.valid()) { Nova::Rights const map_rights (true, - dsc.writable() && attribute.writeable, + dsc.writeable() && attribute.writeable, attribute.executable); Nova::Mem_crd const mem(page.addr >> 12, page.log2_order - 12, map_rights); diff --git a/repos/base-sel4/src/core/spec/x86/vm_session_component.cc b/repos/base-sel4/src/core/spec/x86/vm_session_component.cc index 65173ecf67..b241430fcb 100644 --- a/repos/base-sel4/src/core/spec/x86/vm_session_component.cc +++ b/repos/base-sel4/src/core/spec/x86/vm_session_component.cc @@ -251,7 +251,7 @@ void Vm_session_component::_attach_vm_memory(Dataspace_component &dsc, Vm_space::Map_attr const attr { .cached = (dsc.cacheability() == CACHED), .write_combined = (dsc.cacheability() == WRITE_COMBINED), - .writeable = dsc.writable() && attribute.writeable, + .writeable = dsc.writeable() && attribute.writeable, .executable = attribute.executable, .flush_support = false }; diff --git a/repos/base/include/dataspace/client.h b/repos/base/include/dataspace/client.h index d4163fa292..1b40bcb700 100644 --- a/repos/base/include/dataspace/client.h +++ b/repos/base/include/dataspace/client.h @@ -25,8 +25,8 @@ struct Genode::Dataspace_client : Rpc_client explicit Dataspace_client(Dataspace_capability ds) : Rpc_client(ds) { } - size_t size() override { return call(); } - bool writable() override { return call(); } + size_t size() override { return call(); } + bool writeable() override { return call(); } }; #endif /* _INCLUDE__DATASPACE__CLIENT_H_ */ diff --git a/repos/base/include/dataspace/dataspace.h b/repos/base/include/dataspace/dataspace.h index 51d29c299f..37c25e2aed 100644 --- a/repos/base/include/dataspace/dataspace.h +++ b/repos/base/include/dataspace/dataspace.h @@ -30,19 +30,19 @@ struct Genode::Dataspace : Interface virtual size_t size() = 0; /** - * Return true if dataspace is writable + * Return true if dataspace is writeable */ - virtual bool writable() = 0; + virtual bool writeable() = 0; /********************* ** RPC declaration ** *********************/ - GENODE_RPC(Rpc_size, size_t, size); - GENODE_RPC(Rpc_writable, bool, writable); + GENODE_RPC(Rpc_size, size_t, size); + GENODE_RPC(Rpc_writeable, bool, writeable); - GENODE_RPC_INTERFACE(Rpc_size, Rpc_writable); + GENODE_RPC_INTERFACE(Rpc_size, Rpc_writeable); }; #endif /* _INCLUDE__DATASPACE__DATASPACE_H_ */ diff --git a/repos/base/src/core/include/dataspace_component.h b/repos/base/src/core/include/dataspace_component.h index 36f773b1c6..933638716b 100644 --- a/repos/base/src/core/include/dataspace_component.h +++ b/repos/base/src/core/include/dataspace_component.h @@ -39,8 +39,8 @@ namespace Genode { addr_t const _phys_addr = 0; /* address of dataspace in physical memory */ addr_t _core_local_addr = 0; /* address of core-local mapping */ size_t const _size = 0; /* size of dataspace in bytes */ - bool const _io_mem = false; /* dataspace is I/O mem, not to be touched */ - bool const _writable = false; /* false if dataspace is read-only */ + bool const _io_mem = false; /* dataspace is I/O mem, not to be touched */ + bool const _writeable = false; /* false if dataspace is read-only */ /* * Access memory cached, write-combined, or uncached respectively @@ -79,12 +79,12 @@ namespace Genode { * This constructor is used by RAM and ROM dataspaces. */ Dataspace_component(size_t size, addr_t core_local_addr, - Cache cache, bool writable, + Cache cache, bool writeable, Dataspace_owner *owner) : _phys_addr(core_local_addr), _core_local_addr(core_local_addr), _size(round_page(size)), _io_mem(false), - _writable(writable), _cache(cache), + _writeable(writeable), _cache(cache), _owner(owner), _managed(false) { } /** @@ -99,10 +99,10 @@ namespace Genode { */ Dataspace_component(size_t size, addr_t core_local_addr, addr_t phys_addr, Cache cache, - bool writable, Dataspace_owner *owner) + bool writeable, Dataspace_owner *owner) : _phys_addr(phys_addr), _core_local_addr(core_local_addr), - _size(size), _io_mem(true), _writable(writable), + _size(size), _io_mem(true), _writeable(writeable), _cache(cache), _owner(owner), _managed(false) { } /** @@ -156,8 +156,8 @@ namespace Genode { ** Dataspace interface ** *************************/ - size_t size() override { return _size; } - bool writable() override { return _writable; } + size_t size() override { return _size; } + bool writeable() override { return _writeable; } }; } diff --git a/repos/base/src/core/region_map_component.cc b/repos/base/src/core/region_map_component.cc index 715708cb75..af2bf50681 100644 --- a/repos/base/src/core/region_map_component.cc +++ b/repos/base/src/core/region_map_component.cc @@ -213,7 +213,7 @@ int Rm_client::pager(Ipc_pager &pager) * Check if dataspace is compatible with page-fault type */ if (pf_type == Region_map::State::WRITE_FAULT && - (!region->write() || !dsc->writable())) { + (!region->write() || !dsc->writeable())) { print_page_fault("attempted write at read-only memory", pf_addr, pf_ip, pf_type, *this); @@ -346,7 +346,7 @@ Mapping Region_map_component::create_map_item(Region_map_component *, .io_mem = dataspace.io_mem(), .dma_buffer = region.dma(), .write_combined = dataspace.cacheability() == WRITE_COMBINED, - .writeable = region.write() && dataspace.writable(), + .writeable = region.write() && dataspace.writeable(), .executable = region.executable() }; } diff --git a/repos/base/src/core/vm_session_common.cc b/repos/base/src/core/vm_session_common.cc index 4f74f67e36..acf7fa256e 100644 --- a/repos/base/src/core/vm_session_common.cc +++ b/repos/base/src/core/vm_session_common.cc @@ -73,7 +73,7 @@ void Vm_session_component::attach(Dataspace_capability const cap, { .base = guest_phys, .size = attribute.size, - .write = dsc.writable() && attribute.writeable, + .write = dsc.writeable() && attribute.writeable, .exec = attribute.executable, .off = (off_t)attribute.offset, .dma = false, diff --git a/repos/base/src/include/base/internal/elf_format.h b/repos/base/src/include/base/internal/elf_format.h index ab612daf1a..2fd9f7959a 100644 --- a/repos/base/src/include/base/internal/elf_format.h +++ b/repos/base/src/include/base/internal/elf_format.h @@ -233,7 +233,7 @@ enum { */ enum { PF_X = (1 << 0), /* segment is executable */ - PF_W = (1 << 1), /* segment is writable */ + PF_W = (1 << 1), /* segment is writeable */ PF_R = (1 << 2), /* segment is readable */ }; diff --git a/repos/base/src/lib/ldso/include/elf.h b/repos/base/src/lib/ldso/include/elf.h index e0b1c86a3b..1c908bca3b 100644 --- a/repos/base/src/lib/ldso/include/elf.h +++ b/repos/base/src/lib/ldso/include/elf.h @@ -153,7 +153,7 @@ namespace Linker { */ enum { PF_X = (1 << 0), /* segment is executable */ - PF_W = (1 << 1), /* segment is writable */ + PF_W = (1 << 1), /* segment is writeable */ PF_R = (1 << 2), /* segment is readable */ PF_MASK = 0x7, }; diff --git a/repos/dde_rump/src/include/util/random.h b/repos/dde_rump/src/include/util/random.h index a98ecc658a..f0f6bd8156 100644 --- a/repos/dde_rump/src/include/util/random.h +++ b/repos/dde_rump/src/include/util/random.h @@ -1,5 +1,5 @@ -/** - * \brief Overwritable backend-random methods +/* + * \brief Overwriteable backend-random methods * \author Sebastian Sumpf * \date 2015-02-13 */ diff --git a/repos/dde_rump/src/lib/rump/io.cc b/repos/dde_rump/src/lib/rump/io.cc index 85c70342bb..6360572fa7 100644 --- a/repos/dde_rump/src/lib/rump/io.cc +++ b/repos/dde_rump/src/lib/rump/io.cc @@ -113,7 +113,7 @@ class Backend uint64_t block_count() const { return _info.block_count; } size_t block_size() const { return _info.block_size; } - bool writable() const { return _info.writeable; } + bool writeable() const { return _info.writeable; } void sync() { @@ -173,8 +173,8 @@ int rumpuser_open(const char *name, int mode, int *fdp) if (!(mode & RUMPUSER_OPEN_BIO || Genode::strcmp(GENODE_BLOCK_SESSION, name))) return ENXIO; - /* check for writable */ - if ((mode & RUMPUSER_OPEN_ACCMODE) && !backend().writable()) + /* check for writeable */ + if ((mode & RUMPUSER_OPEN_ACCMODE) && !backend().writeable()) return EROFS; *fdp = GENODE_FD; diff --git a/repos/gems/recipes/pkg/sculpt/README b/repos/gems/recipes/pkg/sculpt/README index 27ee0bc62b..2153ba6c73 100644 --- a/repos/gems/recipes/pkg/sculpt/README +++ b/repos/gems/recipes/pkg/sculpt/README @@ -885,7 +885,7 @@ File system A file-system service offers the storage and retrieval of data organized in a hierarchical directory structure. Access to a file system can be restricted -to be read only. The distinction between read-only and read-writable does +to be read only. The distinction between read-only and read-writeable does not exist per file but for the entire file-system resource. Of course, many use cases call for finer-grained access control. This is @@ -927,7 +927,7 @@ Block device ~~~~~~~~~~~~ A block-device resource allows for the block-level storage and retrieval -of data whereas a block-device can be read-only or read-writable. The base +of data whereas a block-device can be read-only or read-writeable. The base system's built-in block service hands out the devices listed at _/report/drivers/block_devices_ according to the label of the client's session. The label must correspond to the name of the block device. Typically, the diff --git a/repos/gems/src/app/sculpt_manager/runtime/chroot.cc b/repos/gems/src/app/sculpt_manager/runtime/chroot.cc index 923b920e8c..0129db0c50 100644 --- a/repos/gems/src/app/sculpt_manager/runtime/chroot.cc +++ b/repos/gems/src/app/sculpt_manager/runtime/chroot.cc @@ -14,7 +14,7 @@ #include void Sculpt::gen_chroot_start_content(Xml_generator &xml, Start_name const &name, - Path const &path, Writeable writable) + Path const &path, Writeable writeable) { gen_common_start_content(xml, name, Cap_quota{100}, Ram_quota{2*1024*1024}, @@ -25,7 +25,7 @@ void Sculpt::gen_chroot_start_content(Xml_generator &xml, Start_name const &name xml.node("config", [&] () { xml.node("default-policy", [&] () { xml.attribute("path", path); - if (writable == WRITEABLE) + if (writeable == WRITEABLE) xml.attribute("writeable", "yes"); }); }); diff --git a/repos/os/include/file_system_session/connection.h b/repos/os/include/file_system_session/connection.h index fc4285de8e..8b7ea53f83 100644 --- a/repos/os/include/file_system_session/connection.h +++ b/repos/os/include/file_system_session/connection.h @@ -61,7 +61,7 @@ struct File_system::Connection : Genode::Connection, Session_client * transmission buffer * \param label session label * \param root root directory of session - * \param writeable session is writable + * \param writeable session is writeable * \param tx_buf_size size of transmission buffer in bytes */ Connection(Genode::Env &env, diff --git a/repos/os/src/drivers/uart/spec/pbxa9/uart_driver.h b/repos/os/src/drivers/uart/spec/pbxa9/uart_driver.h index 37c867e4d9..f5e123e40f 100644 --- a/repos/os/src/drivers/uart/spec/pbxa9/uart_driver.h +++ b/repos/os/src/drivers/uart/spec/pbxa9/uart_driver.h @@ -98,7 +98,7 @@ class Uart::Driver : private Genode::Attached_io_mem_dataspace, /** * Register offsets * - * Registers are read/writable unless explicitly stated. + * Registers are read/writeable unless explicitly stated. */ enum Register { UARTDR = 0x000, /* data */ diff --git a/repos/os/src/server/lx_fs/main.cc b/repos/os/src/server/lx_fs/main.cc index 6104880e43..b0d218a027 100644 --- a/repos/os/src/server/lx_fs/main.cc +++ b/repos/os/src/server/lx_fs/main.cc @@ -96,7 +96,7 @@ class Lx_fs::Session_component : private Session_resources, Genode::Env &_env; Directory &_root; Id_space _open_node_registry { }; - bool _writable; + bool _writeable; Absolute_path const _root_dir; Signal_handler _process_packet_dispatcher; Notifier &_notifier; @@ -258,14 +258,14 @@ class Lx_fs::Session_component : private Session_resources, Genode::Cap_quota cap_quota, size_t tx_buf_size, char const *root_dir, - bool writable, + bool writeable, Notifier ¬ifier) : Session_resources { env.pd(), env.rm(), ram_quota, cap_quota, tx_buf_size }, Session_rpc_object {_packet_ds.cap(), env.rm(), env.ep().rpc_ep() }, _env { env }, _root { *new (&_alloc) Directory { _alloc, root_dir, false } }, - _writable { writable }, + _writeable { writeable }, _root_dir { root_dir }, _process_packet_dispatcher { env.ep(), *this, &Session_component::_process_packets }, _notifier { notifier } @@ -328,7 +328,7 @@ class Lx_fs::Session_component : private Session_resources, Node &dir = open_node.node(); - if (!_writable) + if (!_writeable) if (create || (mode != STAT_ONLY && mode != READ_ONLY)) throw Permission_denied(); @@ -367,7 +367,7 @@ class Lx_fs::Session_component : private Session_resources, /* skip leading '/' */ path_str++; - if (!_writable && create) + if (!_writeable && create) throw Permission_denied(); if (!path.valid_string()) @@ -451,7 +451,7 @@ class Lx_fs::Session_component : private Session_resources, if (!valid_name(name.string())) throw Invalid_name(); - if (!_writable) + if (!_writeable) throw Permission_denied(); auto unlink_fn = [&] (Open_node &open_node) { @@ -500,7 +500,7 @@ class Lx_fs::Session_component : private Session_resources, void truncate(File_handle file_handle, file_size_t size) override { - if (!_writable) + if (!_writeable) throw Permission_denied(); auto truncate_fn = [&] (Open_node &open_node) { diff --git a/repos/ports/run/virtualbox_auto.inc b/repos/ports/run/virtualbox_auto.inc index 837be1950f..d8082d9ae8 100644 --- a/repos/ports/run/virtualbox_auto.inc +++ b/repos/ports/run/virtualbox_auto.inc @@ -72,9 +72,9 @@ append_platform_drv_build_components build $build_components if {$use_rumpfs && !$use_ram_fs} { - set rump_writable true + set rump_writeable true } else { - set rump_writable false + set rump_writeable false } set config { @@ -162,7 +162,7 @@ append_if [expr $use_rumpfs] config { append_if [expr $use_rumpfs && $use_ram_fs && $use_overlay_from_disk] config { } append_if [expr $use_rumpfs] config { - +