From d12170bb0cb936f1e48a677dbd96822db55bbda3 Mon Sep 17 00:00:00 2001 From: Joseph Hunkeler Date: Wed, 3 Jun 2020 00:10:25 -0400 Subject: Refactor fstree (#39) * Refactor fstree, fstree_free, FSTree type * Add FSRec structure * Refactor fstree usage * Decrease starting size of FSTree structure * Check if ManifestPackage is NULL, not if the requirements array if NULL * Use num_requirements instead of '!= NULL' * Add fstree test --- lib/install.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'lib/install.c') diff --git a/lib/install.c b/lib/install.c index 282c662..a2fdf9f 100644 --- a/lib/install.c +++ b/lib/install.c @@ -344,8 +344,11 @@ int spm_do_install(SPM_Hierarchy *fs, ManifestList *mf, StrList *packages) { } // free requirements array - for (size_t i = 0; requirements != NULL && requirements[i] != NULL; i++) { - manifest_package_free(requirements[i]); + for (size_t i = 0; i < num_requirements; i++) { + if (requirements[i] != NULL) { + manifest_package_free(requirements[i]); + requirements[i] = NULL; + } } free(package_dir); -- cgit