diff options
author | Patrick Steinhardt <ps@pks.im> | 2018-02-08 11:14:48 +0000 |
---|---|---|
committer | Patrick Steinhardt <ps@pks.im> | 2018-06-10 19:34:37 +0200 |
commit | ecf4f33a4e327a91496f72816f9f02d923e5af05 (patch) | |
tree | bb8eccc9ab0dc8f36a702c8a15ad5ae92429ee07 /tests/submodule | |
parent | 56ffdfc61e37b9e7634c7c73b05d84355bea61cd (diff) | |
download | libgit2-ecf4f33a4e327a91496f72816f9f02d923e5af05.tar.gz |
Convert usage of `git_buf_free` to new `git_buf_dispose`
Diffstat (limited to 'tests/submodule')
-rw-r--r-- | tests/submodule/add.c | 8 | ||||
-rw-r--r-- | tests/submodule/escape.c | 4 | ||||
-rw-r--r-- | tests/submodule/init.c | 6 | ||||
-rw-r--r-- | tests/submodule/lookup.c | 8 | ||||
-rw-r--r-- | tests/submodule/nosubs.c | 2 | ||||
-rw-r--r-- | tests/submodule/open.c | 8 | ||||
-rw-r--r-- | tests/submodule/repository_init.c | 2 | ||||
-rw-r--r-- | tests/submodule/status.c | 2 | ||||
-rw-r--r-- | tests/submodule/submodule_helpers.c | 6 |
9 files changed, 23 insertions, 23 deletions
diff --git a/tests/submodule/add.c b/tests/submodule/add.c index ebb9d6292..d5886776d 100644 --- a/tests/submodule/add.c +++ b/tests/submodule/add.c @@ -22,7 +22,7 @@ static void assert_submodule_url(const char* name, const char *url) cl_git_pass(git_buf_printf(&key, "submodule.%s.url", name)); assert_config_entry_value(g_repo, git_buf_cstr(&key), url); - git_buf_free(&key); + git_buf_dispose(&key); } void test_submodule_add__url_absolute(void) @@ -62,7 +62,7 @@ void test_submodule_add__url_absolute(void) cl_assert_equal_s("gitdir: ../.git/modules/sm_libgit2/", dot_git_content.ptr); git_repository_free(repo); - git_buf_free(&dot_git_content); + git_buf_dispose(&dot_git_content); /* add a submodule not using a gitlink */ @@ -163,7 +163,7 @@ void test_submodule_add__path_exists_in_index(void) cl_git_fail_with(git_submodule_add_setup(&sm, g_repo, "./", "subdirectory", 1), GIT_EEXISTS); git_submodule_free(sm); - git_buf_free(&filename); + git_buf_dispose(&filename); } void test_submodule_add__file_exists_in_index(void) @@ -181,5 +181,5 @@ void test_submodule_add__file_exists_in_index(void) cl_git_fail_with(git_submodule_add_setup(&sm, g_repo, "./", "subdirectory", 1), GIT_EEXISTS); git_submodule_free(sm); - git_buf_free(&name); + git_buf_dispose(&name); } diff --git a/tests/submodule/escape.c b/tests/submodule/escape.c index f5c3cd4cd..c36874296 100644 --- a/tests/submodule/escape.c +++ b/tests/submodule/escape.c @@ -43,7 +43,7 @@ void test_submodule_escape__from_gitdir(void) "[submodule \"" EVIL_SM_NAME "\"]\n" " path = testrepo\n" " url = ../testrepo.git\n"); - git_buf_free(&buf); + git_buf_dispose(&buf); /* Find it all the different ways we know about it */ foundit = 0; @@ -77,7 +77,7 @@ void test_submodule_escape__from_gitdir_windows(void) "[submodule \"" EVIL_SM_NAME_WINDOWS "\"]\n" " path = testrepo\n" " url = ../testrepo.git\n"); - git_buf_free(&buf); + git_buf_dispose(&buf); /* Find it all the different ways we know about it */ foundit = 0; diff --git a/tests/submodule/init.c b/tests/submodule/init.c index 9e0cf5753..b84adf508 100644 --- a/tests/submodule/init.c +++ b/tests/submodule/init.c @@ -39,7 +39,7 @@ void test_submodule_init__absolute_url(void) cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url")); cl_assert_equal_s(absolute_url.ptr, config_url); - git_buf_free(&absolute_url); + git_buf_dispose(&absolute_url); git_config_free(cfg); git_submodule_free(sm); } @@ -69,7 +69,7 @@ void test_submodule_init__relative_url(void) cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url")); cl_assert_equal_s(absolute_url.ptr, config_url); - git_buf_free(&absolute_url); + git_buf_dispose(&absolute_url); git_config_free(cfg); git_submodule_free(sm); } @@ -107,7 +107,7 @@ void test_submodule_init__relative_url_detached_head(void) cl_git_pass(git_config_get_string(&config_url, cfg, "submodule.testrepo.url")); cl_assert_equal_s(absolute_url.ptr, config_url); - git_buf_free(&absolute_url); + git_buf_dispose(&absolute_url); git_config_free(cfg); git_object_free(head_commit); git_reference_free(head_ref); diff --git a/tests/submodule/lookup.c b/tests/submodule/lookup.c index f73ca2679..8bab1b93a 100644 --- a/tests/submodule/lookup.c +++ b/tests/submodule/lookup.c @@ -195,7 +195,7 @@ void test_submodule_lookup__backslashes(void) cl_git_pass(git_submodule_resolve_url(&buf, g_repo, backslashed_path)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_submodule_free(sm); git_repository_free(subrepo); } @@ -227,7 +227,7 @@ static void add_submodule_with_commit(const char *name) cl_git_pass(git_buf_joinpath(&p, git_repository_workdir(smrepo), "file")); cl_git_mkfile(p.ptr, "new file"); - git_buf_free(&p); + git_buf_dispose(&p); cl_git_pass(git_index_add_bypath(idx, "file")); cl_git_pass(git_index_write(idx)); @@ -293,7 +293,7 @@ void test_submodule_lookup__just_added(void) baseline_tests(); cl_git_rewritefile("submod2/.gitmodules", snap2.ptr); - git_buf_free(&snap2); + git_buf_dispose(&snap2); refute_submodule_exists(g_repo, "mismatch_name", GIT_ENOTFOUND); refute_submodule_exists(g_repo, "mismatch_path", GIT_ENOTFOUND); @@ -304,7 +304,7 @@ void test_submodule_lookup__just_added(void) baseline_tests(); cl_git_rewritefile("submod2/.gitmodules", snap1.ptr); - git_buf_free(&snap1); + git_buf_dispose(&snap1); refute_submodule_exists(g_repo, "mismatch_name", GIT_ENOTFOUND); refute_submodule_exists(g_repo, "mismatch_path", GIT_ENOTFOUND); diff --git a/tests/submodule/nosubs.c b/tests/submodule/nosubs.c index 8a73dc11a..ca2d1d693 100644 --- a/tests/submodule/nosubs.c +++ b/tests/submodule/nosubs.c @@ -85,7 +85,7 @@ void test_submodule_nosubs__add_and_delete(void) cl_git_pass(git_futils_readbuffer(&buf, "status/.gitmodules")); cl_assert(strstr(buf.ptr, "[submodule \"submodules/libgit2\"]") != NULL); cl_assert(strstr(buf.ptr, "path = submodules/libgit2") != NULL); - git_buf_free(&buf); + git_buf_dispose(&buf); /* lookup */ diff --git a/tests/submodule/open.c b/tests/submodule/open.c index 0ef01ec24..a8a5dccc3 100644 --- a/tests/submodule/open.c +++ b/tests/submodule/open.c @@ -48,8 +48,8 @@ static void assert_sm_valid(git_repository *parent, git_repository *child, const cl_git_pass(git_path_prettify_dir(&actual, actual.ptr, NULL)); cl_assert_equal_s(expected.ptr, actual.ptr); - git_buf_free(&expected); - git_buf_free(&actual); + git_buf_dispose(&expected); + git_buf_dispose(&actual); } void test_submodule_open__opening_via_lookup_succeeds(void) @@ -67,7 +67,7 @@ void test_submodule_open__direct_open_succeeds(void) cl_git_pass(git_repository_open(&g_child, path.ptr)); assert_sm_valid(g_parent, g_child, "sm_unchanged"); - git_buf_free(&path); + git_buf_dispose(&path); } void test_submodule_open__direct_open_succeeds_for_broken_sm_with_gitdir(void) @@ -86,5 +86,5 @@ void test_submodule_open__direct_open_succeeds_for_broken_sm_with_gitdir(void) cl_git_pass(git_repository_open(&g_child, path.ptr)); assert_sm_valid(g_parent, g_child, "sm_unchanged"); - git_buf_free(&path); + git_buf_dispose(&path); } diff --git a/tests/submodule/repository_init.c b/tests/submodule/repository_init.c index 9be1e0b23..7dd97bac0 100644 --- a/tests/submodule/repository_init.c +++ b/tests/submodule/repository_init.c @@ -34,5 +34,5 @@ void test_submodule_repository_init__basic(void) git_submodule_free(sm); git_repository_free(repo); - git_buf_free(&dot_git_content); + git_buf_dispose(&dot_git_content); } diff --git a/tests/submodule/status.c b/tests/submodule/status.c index 10f385ce9..41fc17387 100644 --- a/tests/submodule/status.c +++ b/tests/submodule/status.c @@ -34,7 +34,7 @@ static void rm_submodule(const char *name) git_buf path = GIT_BUF_INIT; cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), name)); cl_git_pass(git_futils_rmdir_r(path.ptr, NULL, GIT_RMDIR_REMOVE_FILES)); - git_buf_free(&path); + git_buf_dispose(&path); } static void add_submodule_to_index(const char *name) diff --git a/tests/submodule/submodule_helpers.c b/tests/submodule/submodule_helpers.c index cd541ea86..4bb064899 100644 --- a/tests/submodule/submodule_helpers.c +++ b/tests/submodule/submodule_helpers.c @@ -79,9 +79,9 @@ void rewrite_gitmodules(const char *workdir) cl_must_pass(p_unlink(in_f.ptr)); - git_buf_free(&in_f); - git_buf_free(&out_f); - git_buf_free(&path); + git_buf_dispose(&in_f); + git_buf_dispose(&out_f); + git_buf_dispose(&path); } static void cleanup_fixture_submodules(void *payload) |