changed array size to no longer be a pointer, need to check every file that references array to hopefully not have broken anything
This commit is contained in:
parent
56a4aa9d39
commit
533541b852
6 changed files with 29 additions and 24 deletions
|
|
@ -36,9 +36,8 @@ uint8_t ARC_CSV_Read(ARC_Config *config, ARC_String *string, void **value){
|
|||
}
|
||||
|
||||
*value = malloc(sizeof(ARC_Array));
|
||||
((ARC_Array *)*value)->data = malloc(sizeof(ARC_Array *) * height);
|
||||
((ARC_Array *)*value)->size = malloc(sizeof(uint32_t) );
|
||||
*((ARC_Array *)*value)->size = height;
|
||||
((ARC_Array *)*value)->data = malloc(sizeof(ARC_Array *) * height);
|
||||
((ARC_Array *)*value)->size = height;
|
||||
|
||||
uint32_t index = 0;
|
||||
for(uint32_t y = 0; y < height; y++){
|
||||
|
|
@ -65,8 +64,7 @@ uint8_t ARC_CSV_Read(ARC_Config *config, ARC_String *string, void **value){
|
|||
|
||||
((ARC_Array **)((ARC_Array *)*value)->data)[y] = (ARC_Array *) malloc(sizeof(ARC_Array));
|
||||
((ARC_Array **)((ARC_Array *)*value)->data)[y]->data = malloc(sizeof(int32_t ) * width);
|
||||
((ARC_Array **)((ARC_Array *)*value)->data)[y]->size = malloc(sizeof(uint32_t) );
|
||||
*((ARC_Array **)((ARC_Array *)*value)->data)[y]->size = width;
|
||||
((ARC_Array **)((ARC_Array *)*value)->data)[y]->size = width;
|
||||
|
||||
for(uint32_t i = index; i < fileData->length; i++){
|
||||
if(fileData->data[i] != ',' && fileData->data[i] != '\n'){
|
||||
|
|
@ -92,13 +90,11 @@ uint8_t ARC_CSV_Read(ARC_Config *config, ARC_String *string, void **value){
|
|||
|
||||
void ARC_CSV_Delete(ARC_Config *config, ARC_String *string, void *value){
|
||||
ARC_Array *valueArray = value;
|
||||
for(uint32_t i = 0; i < *valueArray->size; i++){
|
||||
for(uint32_t i = 0; i < valueArray->size; i++){
|
||||
free((int32_t *)((ARC_Array **)valueArray->data)[i]->data);
|
||||
free((uint32_t *)((ARC_Array **)valueArray->data)[i]->size);
|
||||
free((ARC_Array *)((ARC_Array **)valueArray->data)[i]);
|
||||
}
|
||||
|
||||
free((ARC_Array **)valueArray->data);
|
||||
free((uint32_t *)valueArray->size);
|
||||
free(valueArray);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue