kernel: don't use typedef for enums or non-opaque structs
This commit is contained in:
22
kxld/kext.c
22
kxld/kext.c
@@ -6,10 +6,10 @@
|
||||
#include <stddef.h>
|
||||
|
||||
static spin_lock_t kext_tree_lock = SPIN_LOCK_INIT;
|
||||
static object_t *kext_set;
|
||||
btree_t kext_tree;
|
||||
static struct object *kext_set;
|
||||
struct btree kext_tree;
|
||||
|
||||
static kern_status_t kext_query_name(object_t *obj, char out[OBJECT_NAME_MAX])
|
||||
static kern_status_t kext_query_name(struct object *obj, char out[OBJECT_NAME_MAX])
|
||||
{
|
||||
struct kext *kext = object_data(obj);
|
||||
strncpy(out, kext->k_ident, OBJECT_NAME_MAX - 1);
|
||||
@@ -17,7 +17,7 @@ static kern_status_t kext_query_name(object_t *obj, char out[OBJECT_NAME_MAX])
|
||||
return KERN_OK;
|
||||
}
|
||||
|
||||
static kern_status_t kext_destroy(object_t *obj)
|
||||
static kern_status_t kext_destroy(struct object *obj)
|
||||
{
|
||||
struct kext *kext = object_data(obj);
|
||||
if (kext->k_dependencies) {
|
||||
@@ -27,7 +27,7 @@ static kern_status_t kext_destroy(object_t *obj)
|
||||
return KERN_OK;
|
||||
}
|
||||
|
||||
static object_type_t kext_type = {
|
||||
static struct object_type kext_type = {
|
||||
.ob_name = "kext",
|
||||
.ob_size = sizeof(struct kext),
|
||||
.ob_ops = {
|
||||
@@ -38,7 +38,7 @@ static object_type_t kext_type = {
|
||||
static struct kext *kext_get(const char *ident)
|
||||
{
|
||||
uint64_t ident_hash = hash_string(ident);
|
||||
btree_node_t *cur = kext_tree.b_root;
|
||||
struct btree_node *cur = kext_tree.b_root;
|
||||
|
||||
while (cur) {
|
||||
struct kext *cur_node = BTREE_CONTAINER(struct kext, k_node, cur);
|
||||
@@ -62,10 +62,10 @@ static void kext_add(struct kext *kext)
|
||||
return;
|
||||
}
|
||||
|
||||
btree_node_t *cur = kext_tree.b_root;
|
||||
struct btree_node *cur = kext_tree.b_root;
|
||||
while (1) {
|
||||
struct kext *cur_node = BTREE_CONTAINER(struct kext, k_node, cur);
|
||||
btree_node_t *next = NULL;
|
||||
struct btree_node *next = NULL;
|
||||
|
||||
if (kext->k_ident_hash > cur_node->k_ident_hash) {
|
||||
next = btree_right(cur);
|
||||
@@ -103,7 +103,7 @@ struct kext *kext_get_by_id(const char *ident)
|
||||
|
||||
struct kext *kext = kext_get(ident);
|
||||
if (kext) {
|
||||
object_t *kext_obj = object_header(kext);
|
||||
struct object *kext_obj = object_header(kext);
|
||||
object_ref(kext_obj);
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ kern_status_t kext_cache_init(void)
|
||||
|
||||
struct kext *kext_alloc(void)
|
||||
{
|
||||
object_t *kext_obj = object_create(&kext_type);
|
||||
struct object *kext_obj = object_create(&kext_type);
|
||||
if (!kext_obj) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -145,7 +145,7 @@ kern_status_t kext_register(struct kext *kext)
|
||||
return KERN_NAME_EXISTS;
|
||||
}
|
||||
|
||||
object_t *kext_obj = object_header(kext);
|
||||
struct object *kext_obj = object_header(kext);
|
||||
object_ref(object_header(kext));
|
||||
kext_add(kext);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user