Use GENERIC_ARRAY_FREE instead of split_free()

5 files changed, 11 insertions, 11 deletions

diff --git a/src/conda.c b/src/conda.c
index f6d1420..332049d 100644
--- a/src/conda.c
+++ b/src/conda.c
@@ -149,7 +149,7 @@ int conda_activate(const char *root, const char *env_name) {
         } else {
             setenv(part[0], part[1], 1);
         }
-        split_free(part);
+        GENERIC_ARRAY_FREE(part);
         i++;
     }
     fclose(fp);
diff --git a/src/deliverable.c b/src/deliverable.c
index d99590f..6b70912 100644
--- a/src/deliverable.c
+++ b/src/deliverable.c
@@ -111,6 +111,7 @@ int delivery_init_tmpdir(struct Delivery *ctx) {
 
 void delivery_free(struct Delivery *ctx) {
     guard_free(ctx->system.arch);
+    GENERIC_ARRAY_FREE(ctx->system.platform);
     guard_free(ctx->meta.name);
     guard_free(ctx->meta.version);
     guard_free(ctx->meta.codename);
@@ -1086,7 +1087,7 @@ int delivery_index_wheel_artifacts(struct Delivery *ctx) {
         strcpy(name, rec->d_name);
         char **parts = split(name, "-", 1);
         strcpy(name, parts[0]);
-        split_free(parts);
+        GENERIC_ARRAY_FREE(parts);
 
         tolower_s(name);
         char path_dest[PATH_MAX];
diff --git a/src/environment.c b/src/environment.c
index 67f8069..525e1da 100644
--- a/src/environment.c
+++ b/src/environment.c
@@ -117,7 +117,7 @@ void runtime_export(RuntimeEnv *env, char **keys) {
             puts(output);
         }
         guard_free(value);
-        split_free(pair);
+        GENERIC_ARRAY_FREE(pair);
     }
 }
 
@@ -210,10 +210,10 @@ ssize_t runtime_contains(RuntimeEnv *env, const char *key) {
         }
         if (strcmp(pair[0], key) == 0) {
             result = i;
-            split_free(pair);
+            GENERIC_ARRAY_FREE(pair);
             break;
         }
-        split_free(pair);
+        GENERIC_ARRAY_FREE(pair);
     }
     return result;
 }
@@ -246,7 +246,7 @@ char *runtime_get(RuntimeEnv *env, const char *key) {
     if (key_offset != -1) {
         char **pair = split(strlist_item(env, key_offset), "=", 0);
         result = join(&pair[1], "=");
-        split_free(pair);
+        GENERIC_ARRAY_FREE(pair);
     }
     return result;
 }
@@ -292,8 +292,7 @@ char *runtime_expand_var(RuntimeEnv *env, char *input) {
 
     expanded = calloc(OMC_BUFSIZ, sizeof(char));
     if (expanded == NULL) {
-        perror("could not allocate runtime_expand_var buffer");
-        fprintf(SYSERROR);
+        SYSERROR("could not allocate %d bytes for runtime_expand_var buffer", OMC_BUFSIZ);
         return NULL;
     }
 
@@ -428,7 +427,7 @@ void runtime_apply(RuntimeEnv *env) {
     for (size_t i = 0; i < strlist_count(env); i++) {
         char **pair = split(strlist_item(env, i), "=", 1);
         setenv(pair[0], pair[1], 1);
-        split_free(pair);
+        GENERIC_ARRAY_FREE(pair);
     }
 }
 
diff --git a/src/strlist.c b/src/strlist.c
index 5832802..9e9bafb 100644
--- a/src/strlist.c
+++ b/src/strlist.c
@@ -167,7 +167,7 @@ void strlist_append_strlist(struct StrList *pStrList1, struct StrList *pStrList2
          for (size_t i = 0; token[i] != NULL; i++) {
              strlist_append(pStrList, token[i]);
          }
-         split_free(token);
+         GENERIC_ARRAY_FREE(token);
      }
  }
 
diff --git a/src/wheel.c b/src/wheel.c
index a4ddbff..8f48828 100644
--- a/src/wheel.c
+++ b/src/wheel.c
@@ -66,7 +66,7 @@ struct Wheel *get_wheel_file(const char *basepath, const char *name, char *to_ma
             result->abi_tag = strdup(parts[4]);
             result->platform_tag = strdup(parts[5]);
         }
-        split_free(parts);
+        GENERIC_ARRAY_FREE(parts);
         break;
     }
     closedir(dp);