giomba
/
nes-proj
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tidy-up codestyle

This commit is contained in:
George Oikonomou 2017-12-16 01:14:54 +00:00
parent b6aac6b008
commit fe2c960756
1 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
os/lib/list.c
View File

@ -52,7 +52,6 @@
struct list { struct list {
struct list *next; struct list *next;
}; };
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** /**
* Initialize a list. * Initialize a list.
@ -118,13 +117,13 @@ void *
list_tail(list_t list) list_tail(list_t list)
{ {
struct list *l; struct list *l;
if(*list == NULL) { if(*list == NULL) {
return NULL; return NULL;
} }
for(l = *list; l->next != NULL; l = l->next); for(l = *list; l->next != NULL; l = l->next);
return l; return l;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -148,7 +147,7 @@ list_add(list_t list, void *item)
list_remove(list, item); list_remove(list, item);
((struct list *)item)->next = NULL; ((struct list *)item)->next = NULL;
l = list_tail(list); l = list_tail(list);
if(l == NULL) { if(l == NULL) {
@ -164,8 +163,6 @@ list_add(list_t list, void *item)
void void
list_push(list_t list, void *item) list_push(list_t list, void *item)
{ {
/* struct list *l;*/
/* Make sure not to add the same element twice */ /* Make sure not to add the same element twice */
list_remove(list, item); list_remove(list, item);
@ -186,7 +183,7 @@ void *
list_chop(list_t list) list_chop(list_t list)
{ {
struct list *l, *r; struct list *l, *r;
if(*list == NULL) { if(*list == NULL) {
return NULL; return NULL;
} }
@ -195,12 +192,12 @@ list_chop(list_t list)
*list = NULL; *list = NULL;
return l; return l;
} }
for(l = *list; l->next->next != NULL; l = l->next); for(l = *list; l->next->next != NULL; l = l->next);
r = l->next; r = l->next;
l->next = NULL; l->next = NULL;
return r; return r;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -240,20 +237,20 @@ void
list_remove(list_t list, void *item) list_remove(list_t list, void *item)
{ {
struct list *l, *r; struct list *l, *r;
if(*list == NULL) { if(*list == NULL) {
return; return;
} }
r = NULL; r = NULL;
for(l = *list; l != NULL; l = l->next) { for(l = *list; l != NULL; l = l->next) {
if(l == item) { if(l == item) {
if(r == NULL) { if(r == NULL) {
/* First on list */ /* First on list */
*list = l->next; *list = l->next;
} else { } else {
/* Not first on list */ /* Not first on list */
r->next = l->next; r->next = l->next;
} }
l->next = NULL; l->next = NULL;
return; return;
@ -324,7 +321,7 @@ list_insert(list_t list, void *previtem, void *newitem)
void * void *
list_item_next(void *item) list_item_next(void *item)
{ {
return item == NULL? NULL: ((struct list *)item)->next; return item == NULL ? NULL : ((struct list *)item)->next;
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
/** @} */ /** @} */