Barbara Hunter

arrays/arrays.c

@@ -21,11 +21,13 @@ typedef struct Array {
  *****/
 Array *create_array (int capacity) {
   // Allocate memory for the Array struct
-
+  Array *newArray = malloc(sizeof(Array));
   // Set initial values for capacity and count
-
+  newArray->capacity = capacity;
+  newArray->count = 0;
   // Allocate memory for elements
-
+  newArray->elements = calloc(capacity, sizeof(char *));
+  return newArray;
 }
 
 
@@ -35,9 +37,14 @@ Array *create_array (int capacity) {
 void destroy_array(Array *arr) {
 
   // Free all elements
-
+  for (int i = 0; i < arr->count; i++)
+  {
+    arr->elements[i] = NULL;
+    free(arr->elements[i]);
+  }
   // Free array
-
+  free(arr->elements);
+  free(arr);
 }
 
 /*****
@@ -47,13 +54,26 @@ void destroy_array(Array *arr) {
 void resize_array(Array *arr) {
 
   // Create a new element storage with double capacity
+  char **newElements = calloc((2 * arr->capacity), sizeof(char *));
 
   // Copy elements into the new storage
+  for (int i = 0; i < arr->count; i++)
+  {
+    newElements[i] = arr->elements[i];
+  }
 
   // Free the old elements array (but NOT the strings they point to)
 
-  // Update the elements and capacity to new values
+  for (int i = 0; i < arr->count; i++)
+  {
+    arr->elements[i] = NULL;
+    free(arr->elements[i]);
+  }
+  free(arr->elements);
 
+  // Update the elements and capacity to new values
+  arr->elements = newElements;
+  arr->capacity = arr->capacity * 2;
 }