Bootloader: replace blacklist with blocklist
Various projects, both commercial and OSS, began to use inclusive terminology. There is no reason to not do it. In Haiku, bootloader uses Blacklist, which is recommended to replace with Denylist or Blocklist. I think Blocklist is appropriate here, since it's a list used to block offending driver at boot. Some strings remain unchanged for compatibility with previous naming, but this change prepares for later removal of these (once everyone has updated their kernel and bootloader). Change-Id: Id9105ff5e9fcb866000355089b5ef97bf63ee854 Reviewed-on: https://review.haiku-os.org/c/haiku/+/3145 Reviewed-by: Adrien Destugues <[email protected]>
This commit is contained in:
committed by
Adrien Destugues
parent
a78899d40a
commit
560961ee2a
+12
-12
@@ -2,8 +2,8 @@
|
||||
* Copyright 2013, Ingo Weinhold, ingo_weinhold@gmx.de.
|
||||
* Distributed under the terms of the MIT License.
|
||||
*/
|
||||
#ifndef KERNEL_BOOT_PATH_BLACKLIST_H
|
||||
#define KERNEL_BOOT_PATH_BLACKLIST_H
|
||||
#ifndef KERNEL_BOOT_PATH_BLOCKLIST_H
|
||||
#define KERNEL_BOOT_PATH_BLOCKLIST_H
|
||||
|
||||
|
||||
#include <string.h>
|
||||
@@ -11,10 +11,10 @@
|
||||
#include <util/SinglyLinkedList.h>
|
||||
|
||||
|
||||
class BlacklistedPath : public SinglyLinkedListLinkImpl<BlacklistedPath> {
|
||||
class BlockedPath : public SinglyLinkedListLinkImpl<BlockedPath> {
|
||||
public:
|
||||
BlacklistedPath();
|
||||
~BlacklistedPath();
|
||||
BlockedPath();
|
||||
~BlockedPath();
|
||||
|
||||
bool SetTo(const char* path);
|
||||
|
||||
@@ -39,13 +39,13 @@ private:
|
||||
};
|
||||
|
||||
|
||||
class PathBlacklist {
|
||||
class PathBlocklist {
|
||||
public:
|
||||
typedef SinglyLinkedList<BlacklistedPath>::Iterator Iterator;
|
||||
typedef SinglyLinkedList<BlockedPath>::Iterator Iterator;
|
||||
|
||||
public:
|
||||
PathBlacklist();
|
||||
~PathBlacklist();
|
||||
PathBlocklist();
|
||||
~PathBlocklist();
|
||||
|
||||
bool Add(const char* path);
|
||||
void Remove(const char* path);
|
||||
@@ -59,14 +59,14 @@ public:
|
||||
{ return fPaths.GetIterator(); }
|
||||
|
||||
private:
|
||||
BlacklistedPath* _FindPath(const char* path) const;
|
||||
BlockedPath* _FindPath(const char* path) const;
|
||||
|
||||
private:
|
||||
typedef SinglyLinkedList<BlacklistedPath> PathList;
|
||||
typedef SinglyLinkedList<BlockedPath> PathList;
|
||||
|
||||
private:
|
||||
PathList fPaths;
|
||||
};
|
||||
|
||||
|
||||
#endif // KERNEL_BOOT_PATH_BLACKLIST_H
|
||||
#endif // KERNEL_BOOT_PATH_BLOCKLIST_H
|
||||
Reference in New Issue
Block a user