diff options
| author | Tharo <17233964+Thar0@users.noreply.github.com> | 2021-02-14 00:49:40 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-13 19:49:40 -0500 |
| commit | f9d96d9f73ac090245a518ec04f3fa0e50655d1e (patch) | |
| tree | 9dc905fce276cbfb07a05fc2bf0883bcedddcf23 /src/code/listalloc.c | |
| parent | d615ec4f31563b939f8c0dce1c20c79e137c2043 (diff) | |
Fix most compiler warnings in the boot and code segments (#674)
* Less warnings in boot & code segments
* few more warnings gone
* Ran formatter
* z_view warning gone
* -> 1
* f31 -> 31
* Remove function casts
* Few more small improvements
* Separate declaration and assignment in func_80091738 and Item_Give
Co-authored-by: Thar0 <maximilianc64@gmail.com>
Diffstat (limited to 'src/code/listalloc.c')
| -rw-r--r-- | src/code/listalloc.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/code/listalloc.c b/src/code/listalloc.c index b6aefeee2..d4d24138c 100644 --- a/src/code/listalloc.c +++ b/src/code/listalloc.c @@ -7,17 +7,15 @@ ListAlloc* ListAlloc_Init(ListAlloc* this) { } void* ListAlloc_Alloc(ListAlloc* this, u32 size) { - ListAlloc* ptr; + ListAlloc* ptr = SystemArena_MallocDebug(size + sizeof(ListAlloc), "../listalloc.c", 40); ListAlloc* next; - ptr = SystemArena_MallocDebug(size + sizeof(ListAlloc), "../listalloc.c", 40); - if (!ptr) { + if (ptr == NULL) { return NULL; } next = this->next; - - if (next) { + if (next != NULL) { next->next = ptr; } @@ -25,7 +23,7 @@ void* ListAlloc_Alloc(ListAlloc* this, u32 size) { ptr->next = NULL; this->next = ptr; - if (!this->prev) { + if (this->prev == NULL) { this->prev = ptr; } @@ -33,15 +31,13 @@ void* ListAlloc_Alloc(ListAlloc* this, u32 size) { } void ListAlloc_Free(ListAlloc* this, void* data) { - ListAlloc* ptr; - - ptr = &((ListAlloc*)data)[-1]; + ListAlloc* ptr = &((ListAlloc*)data)[-1]; - if (ptr->prev) { + if (ptr->prev != NULL) { ptr->prev->next = ptr->next; } - if (ptr->next) { + if (ptr->next != NULL) { ptr->next->prev = ptr->prev; } @@ -57,10 +53,9 @@ void ListAlloc_Free(ListAlloc* this, void* data) { } void ListAlloc_FreeAll(ListAlloc* this) { - ListAlloc* iter; + ListAlloc* iter = this->prev; - iter = this->prev; - while (iter) { + while (iter != NULL) { ListAlloc_Free(this, (u8*)iter + sizeof(ListAlloc)); iter = this->prev; } |
