mirror of
https://github.com/genodelabs/genode.git
synced 2025-06-18 15:18:20 +00:00
Follow practices suggested by "Effective C++"
The patch adjust the code of the base, base-<kernel>, and os repository. To adapt existing components to fix violations of the best practices suggested by "Effective C++" as reported by the -Weffc++ compiler argument. The changes follow the patterns outlined below: * A class with virtual functions can no longer publicly inherit base classed without a vtable. The inherited object may either be moved to a member variable, or inherited privately. The latter would be used for classes that inherit 'List::Element' or 'Avl_node'. In order to enable the 'List' and 'Avl_tree' to access the meta data, the 'List' must become a friend. * Instead of adding a virtual destructor to abstract base classes, we inherit the new 'Interface' class, which contains a virtual destructor. This way, single-line abstract base classes can stay as compact as they are now. The 'Interface' utility resides in base/include/util/interface.h. * With the new warnings enabled, all member variables must be explicitly initialized. Basic types may be initialized with '='. All other types are initialized with braces '{ ... }' or as class initializers. If basic types and non-basic types appear in a row, it is nice to only use the brace syntax (also for basic types) and align the braces. * If a class contains pointers as members, it must now also provide a copy constructor and assignment operator. In the most cases, one would make them private, effectively disallowing the objects to be copied. Unfortunately, this warning cannot be fixed be inheriting our existing 'Noncopyable' class (the compiler fails to detect that the inheriting class cannot be copied and still gives the error). For now, we have to manually add declarations for both the copy constructor and assignment operator as private class members. Those declarations should be prepended with a comment like this: /* * Noncopyable */ Thread(Thread const &); Thread &operator = (Thread const &); In the future, we should revisit these places and try to replace the pointers with references. In the presence of at least one reference member, the compiler would no longer implicitly generate a copy constructor. So we could remove the manual declaration. Issue #465
This commit is contained in:
committed by
Christian Helmuth
parent
2a33d9aa76
commit
eba9c15746
@ -34,6 +34,12 @@ class Vfs::Tar_file_system : public File_system
|
||||
char *_tar_base = _tar_ds.local_addr<char>();
|
||||
file_size const _tar_size = _tar_ds.size();
|
||||
|
||||
/*
|
||||
* Noncopyable
|
||||
*/
|
||||
Tar_file_system(Tar_file_system const &);
|
||||
Tar_file_system &operator = (Tar_file_system const &);
|
||||
|
||||
class Record
|
||||
{
|
||||
private:
|
||||
@ -90,6 +96,14 @@ class Vfs::Tar_file_system : public File_system
|
||||
|
||||
class Tar_vfs_handle : public Vfs_handle
|
||||
{
|
||||
private:
|
||||
|
||||
/*
|
||||
* Noncopyable
|
||||
*/
|
||||
Tar_vfs_handle(Tar_vfs_handle const &);
|
||||
Tar_vfs_handle &operator = (Tar_vfs_handle const &);
|
||||
|
||||
protected:
|
||||
|
||||
Node const *_node;
|
||||
@ -400,7 +414,7 @@ class Vfs::Tar_file_system : public File_system
|
||||
|
||||
struct Num_dirent_cache
|
||||
{
|
||||
Lock lock;
|
||||
Lock lock { };
|
||||
Node &root_node;
|
||||
bool valid; /* true after first lookup */
|
||||
char key[256]; /* key used for lookup */
|
||||
@ -603,7 +617,7 @@ class Vfs::Tar_file_system : public File_system
|
||||
return OPEN_OK;
|
||||
}
|
||||
|
||||
Opendir_result opendir(char const *path, bool create,
|
||||
Opendir_result opendir(char const *path, bool /* create */,
|
||||
Vfs_handle **out_handle,
|
||||
Genode::Allocator& alloc) override
|
||||
{
|
||||
@ -618,9 +632,9 @@ class Vfs::Tar_file_system : public File_system
|
||||
return OPENDIR_OK;
|
||||
}
|
||||
|
||||
Openlink_result openlink(char const *path, bool create,
|
||||
Vfs_handle **out_handle, Allocator &alloc)
|
||||
{
|
||||
Openlink_result openlink(char const *path, bool /* create */,
|
||||
Vfs_handle **out_handle, Allocator &alloc)
|
||||
{
|
||||
Node const *node = dereference(path);
|
||||
if (!node || !node->record ||
|
||||
node->record->type() != Record::TYPE_SYMLINK)
|
||||
@ -629,7 +643,7 @@ class Vfs::Tar_file_system : public File_system
|
||||
*out_handle = new (alloc) Tar_vfs_symlink_handle(*this, alloc, 0, node);
|
||||
|
||||
return OPENLINK_OK;
|
||||
}
|
||||
}
|
||||
|
||||
void close(Vfs_handle *vfs_handle) override
|
||||
{
|
||||
@ -672,7 +686,7 @@ class Vfs::Tar_file_system : public File_system
|
||||
return handle->read(dst, count, out_count);
|
||||
}
|
||||
|
||||
Ftruncate_result ftruncate(Vfs_handle *handle, file_size) override
|
||||
Ftruncate_result ftruncate(Vfs_handle *, file_size) override
|
||||
{
|
||||
return FTRUNCATE_ERR_NO_PERM;
|
||||
}
|
||||
|
Reference in New Issue
Block a user