chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle initial_capacity = 0 in mju_arrayListCreate.

Browse Source 
Add const to ArrayList function arguments where appropriate.

PiperOrigin-RevId: 559064386
Change-Id: I8763974a60a05f34dadd56e953cefa40fe78df42
This commit is contained in:
Nimrod Gileadi
2023-08-22 04:03:09 -07:00
committed by Copybara-Service
parent 1d36b57d83
commit dae74030fe
3 changed files with 39 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_util_container.c
+5 -4
View File
@@ -23,6 +23,7 @@
// stack allocate and initialize new mjArrayList
mjArrayList* mju_arrayListCreate(mjData* d, size_t element_size, size_t initial_capacity) {
mjArrayList* array_list = (mjArrayList*) mj_stackAllocBytes(d, sizeof(mjArrayList));
initial_capacity = mjMAX(1, initial_capacity);
array_list->d = d;
array_list->element_size = element_size;
array_list->capacity = initial_capacity;
@@ -37,8 +38,8 @@ mjArrayList* mju_arrayListCreate(mjData* d, size_t element_size, size_t initial_
// returns total number of elements in mjArrayList
size_t mju_arrayListSize(mjArrayList* array_list) {
mjArrayList* cursor = array_list;
size_t mju_arrayListSize(const mjArrayList* array_list) {
const mjArrayList* cursor = array_list;
size_t array_list_size = 0;
while (cursor) {
array_list_size += cursor->size;
@@ -70,9 +71,9 @@ void mju_arrayListAdd(mjArrayList* array_list, void* element) {
// returns pointer to element at index, NULL if out of bounds
void* mju_arrayListAt(mjArrayList* array_list, size_t index) {
void* mju_arrayListAt(const mjArrayList* array_list, size_t index) {
// if the index is larger than the current capacity, then it is in a later segment
mjArrayList* cursor = array_list;
const mjArrayList* cursor = array_list;
size_t total_capacity = 0;
while (cursor != NULL && index >= total_capacity + cursor->capacity) {
total_capacity += cursor->capacity;