kernel: don't use typedef for enums or non-opaque structs
This commit is contained in:
26
obj/set.c
26
obj/set.c
@@ -1,11 +1,11 @@
|
||||
#include <socks/object.h>
|
||||
|
||||
struct set {
|
||||
queue_t s_list;
|
||||
struct queue s_list;
|
||||
char s_name[OBJECT_NAME_MAX];
|
||||
};
|
||||
|
||||
static kern_status_t set_query_name(object_t *obj, char out[OBJECT_NAME_MAX])
|
||||
static kern_status_t set_query_name(struct object *obj, char out[OBJECT_NAME_MAX])
|
||||
{
|
||||
struct set *set = object_data(obj);
|
||||
strncpy(out, set->s_name, OBJECT_NAME_MAX - 1);
|
||||
@@ -14,11 +14,11 @@ static kern_status_t set_query_name(object_t *obj, char out[OBJECT_NAME_MAX])
|
||||
return KERN_OK;
|
||||
}
|
||||
|
||||
static kern_status_t set_get_child_at(object_t *obj, size_t at, object_t **out)
|
||||
static kern_status_t set_get_child_at(struct object *obj, size_t at, struct object **out)
|
||||
{
|
||||
struct set *set = object_data(obj);
|
||||
size_t i = 0;
|
||||
queue_foreach(object_t, child, &set->s_list, ob_list) {
|
||||
queue_foreach(struct object, child, &set->s_list, ob_list) {
|
||||
if (i == at) {
|
||||
*out = object_ref(child);
|
||||
return KERN_OK;
|
||||
@@ -30,12 +30,12 @@ static kern_status_t set_get_child_at(object_t *obj, size_t at, object_t **out)
|
||||
return KERN_NO_ENTRY;
|
||||
}
|
||||
|
||||
static kern_status_t set_get_child_named(object_t *obj, const char *name, object_t **out)
|
||||
static kern_status_t set_get_child_named(struct object *obj, const char *name, struct object **out)
|
||||
{
|
||||
struct set *set = object_data(obj);
|
||||
char child_name[OBJECT_NAME_MAX];
|
||||
|
||||
queue_foreach(object_t, child, &set->s_list, ob_list) {
|
||||
queue_foreach(struct object, child, &set->s_list, ob_list) {
|
||||
kern_status_t status = object_query_name(child, child_name);
|
||||
if (status != KERN_OK) {
|
||||
continue;
|
||||
@@ -50,7 +50,7 @@ static kern_status_t set_get_child_named(object_t *obj, const char *name, object
|
||||
return KERN_NO_ENTRY;
|
||||
}
|
||||
|
||||
static object_type_t set_type = {
|
||||
static struct object_type set_type = {
|
||||
.ob_name = "set",
|
||||
.ob_size = sizeof(struct set),
|
||||
.ob_ops = {
|
||||
@@ -65,9 +65,9 @@ void init_set_objects(void)
|
||||
object_type_register(&set_type);
|
||||
}
|
||||
|
||||
object_t *set_create(const char *name)
|
||||
struct object *set_create(const char *name)
|
||||
{
|
||||
object_t *set_obj = object_create(&set_type);
|
||||
struct object *set_obj = object_create(&set_type);
|
||||
if (!set_obj) {
|
||||
return NULL;
|
||||
}
|
||||
@@ -80,7 +80,7 @@ object_t *set_create(const char *name)
|
||||
return set_obj;
|
||||
}
|
||||
|
||||
kern_status_t set_add_object(object_t *set_obj, object_t *obj)
|
||||
kern_status_t set_add_object(struct object *set_obj, struct object *obj)
|
||||
{
|
||||
if (!object_is_set(set_obj)) {
|
||||
return KERN_INVALID_ARGUMENT;
|
||||
@@ -96,7 +96,7 @@ kern_status_t set_add_object(object_t *set_obj, object_t *obj)
|
||||
return status;
|
||||
}
|
||||
|
||||
queue_foreach (object_t, child, &set->s_list, ob_list) {
|
||||
queue_foreach (struct object, child, &set->s_list, ob_list) {
|
||||
object_query_name(child, child_name);
|
||||
|
||||
if (!strcmp(child_name, obj_name)) {
|
||||
@@ -109,7 +109,7 @@ kern_status_t set_add_object(object_t *set_obj, object_t *obj)
|
||||
return KERN_OK;
|
||||
}
|
||||
|
||||
kern_status_t set_remove_object(object_t *set_obj, object_t *obj)
|
||||
kern_status_t set_remove_object(struct object *set_obj, struct object *obj)
|
||||
{
|
||||
if (!object_is_set(set_obj)) {
|
||||
return KERN_INVALID_ARGUMENT;
|
||||
@@ -122,7 +122,7 @@ kern_status_t set_remove_object(object_t *set_obj, object_t *obj)
|
||||
return KERN_OK;
|
||||
}
|
||||
|
||||
bool object_is_set(object_t *obj)
|
||||
bool object_is_set(struct object *obj)
|
||||
{
|
||||
return obj->ob_type == &set_type;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user