diff options
author | Edward Thomson <ethomson@edwardthomson.com> | 2020-05-29 13:13:19 +0100 |
---|---|---|
committer | Edward Thomson <ethomson@edwardthomson.com> | 2020-06-01 22:50:28 +0100 |
commit | 51eff5a58b95f91cbdd8e5caa750964c9f08e895 (patch) | |
tree | 64cebe7a2646eacd6c1fdd068a17213fef39c23b /tests/worktree | |
parent | a9746b306d32cc2d2bc5d446f6f7ae7c7068ba79 (diff) | |
download | libgit2-51eff5a58b95f91cbdd8e5caa750964c9f08e895.tar.gz |
strarray: we should `dispose` instead of `free`
We _dispose_ the contents of objects; we _free_ objects (and their
contents). Update `git_strarray_free` to be `git_strarray_dispose`.
`git_strarray_free` remains as a deprecated proxy function.
Diffstat (limited to 'tests/worktree')
-rw-r--r-- | tests/worktree/bare.c | 4 | ||||
-rw-r--r-- | tests/worktree/refs.c | 4 | ||||
-rw-r--r-- | tests/worktree/worktree.c | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/tests/worktree/bare.c b/tests/worktree/bare.c index 2a0e88239..7234dfffd 100644 --- a/tests/worktree/bare.c +++ b/tests/worktree/bare.c @@ -28,7 +28,7 @@ void test_worktree_bare__list(void) cl_git_pass(git_worktree_list(&wts, g_repo)); cl_assert_equal_i(wts.count, 0); - git_strarray_free(&wts); + git_strarray_dispose(&wts); } void test_worktree_bare__add(void) @@ -48,7 +48,7 @@ void test_worktree_bare__add(void) cl_assert_equal_i(0, git_repository_is_bare(wtrepo)); cl_assert_equal_i(1, git_repository_is_worktree(wtrepo)); - git_strarray_free(&wts); + git_strarray_dispose(&wts); git_worktree_free(wt); git_repository_free(wtrepo); } diff --git a/tests/worktree/refs.c b/tests/worktree/refs.c index e62149d2e..501255274 100644 --- a/tests/worktree/refs.c +++ b/tests/worktree/refs.c @@ -56,8 +56,8 @@ void test_worktree_refs__list(void) } exit: - git_strarray_free(&refs); - git_strarray_free(&wtrefs); + git_strarray_dispose(&refs); + git_strarray_dispose(&wtrefs); cl_git_pass(error); } diff --git a/tests/worktree/worktree.c b/tests/worktree/worktree.c index 5e99dbf61..716d0aa0a 100644 --- a/tests/worktree/worktree.c +++ b/tests/worktree/worktree.c @@ -30,7 +30,7 @@ void test_worktree_worktree__list(void) cl_assert_equal_i(wts.count, 1); cl_assert_equal_s(wts.strings[0], "testrepo-worktree"); - git_strarray_free(&wts); + git_strarray_dispose(&wts); } void test_worktree_worktree__list_with_invalid_worktree_dirs(void) @@ -61,7 +61,7 @@ void test_worktree_worktree__list_with_invalid_worktree_dirs(void) cl_git_pass(git_worktree_list(&wts, fixture.worktree)); cl_assert_equal_i(wts.count, 1); cl_assert_equal_s(wts.strings[0], "testrepo-worktree"); - git_strarray_free(&wts); + git_strarray_dispose(&wts); for (j = 0; j < ARRAY_SIZE(filesets[i]); j++) { git_buf_truncate(&path, len); @@ -81,7 +81,7 @@ void test_worktree_worktree__list_in_worktree_repo(void) cl_assert_equal_i(wts.count, 1); cl_assert_equal_s(wts.strings[0], "testrepo-worktree"); - git_strarray_free(&wts); + git_strarray_dispose(&wts); } void test_worktree_worktree__list_without_worktrees(void) @@ -380,7 +380,7 @@ void test_worktree_worktree__name(void) cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_assert_equal_s(git_worktree_name(wt), "testrepo-worktree"); - + git_worktree_free(wt); } |