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 | |
| parent | 56ffdfc61e37b9e7634c7c73b05d84355bea61cd (diff) | |
| download | libgit2-ecf4f33a4e327a91496f72816f9f02d923e5af05.tar.gz | |
Convert usage of `git_buf_free` to new `git_buf_dispose`
Diffstat (limited to 'tests')
157 files changed, 574 insertions, 574 deletions
diff --git a/tests/apply/fromdiff.c b/tests/apply/fromdiff.c index 349773964..611060988 100644 --- a/tests/apply/fromdiff.c +++ b/tests/apply/fromdiff.c @@ -63,8 +63,8 @@ static int apply_gitbuf( } git__free(filename); - git_buf_free(&result); - git_buf_free(&patchbuf); + git_buf_dispose(&result); + git_buf_dispose(&patchbuf); git_patch_free(patch); return error; diff --git a/tests/apply/fromfile.c b/tests/apply/fromfile.c index 31fffa1a2..0ace639fc 100644 --- a/tests/apply/fromfile.c +++ b/tests/apply/fromfile.c @@ -50,8 +50,8 @@ static int apply_patchfile( } git__free(filename); - git_buf_free(&result); - git_buf_free(&patchbuf); + git_buf_dispose(&result); + git_buf_dispose(&patchbuf); git_patch_free(patch); return error; @@ -81,7 +81,7 @@ static int validate_and_apply_patchfile( error = apply_patchfile(old, old_len, new, new_len, patchfile, filename_expected, mode_expected); - git_buf_free(&validated); + git_buf_dispose(&validated); git_patch_free(patch_fromdiff); return error; diff --git a/tests/attr/repo.c b/tests/attr/repo.c index 8baf50622..eb4300b4e 100644 --- a/tests/attr/repo.c +++ b/tests/attr/repo.c @@ -303,7 +303,7 @@ static void add_to_workdir(const char *filename, const char *content) cl_git_pass(git_buf_joinpath(&buf, "attr", filename)); cl_git_rewritefile(git_buf_cstr(&buf), content); - git_buf_free(&buf); + git_buf_dispose(&buf); } static void assert_proper_normalization(git_index *index, const char *filename, const char *expected_sha) diff --git a/tests/buf/basic.c b/tests/buf/basic.c index 14ea3e7ce..f90c4c6ed 100644 --- a/tests/buf/basic.c +++ b/tests/buf/basic.c @@ -12,7 +12,7 @@ void test_buf_basic__resize(void) git_buf_puts(&buf1, test_string); cl_assert(strlen(git_buf_cstr(&buf1)) == strlen(test_string) * 2); - git_buf_free(&buf1); + git_buf_dispose(&buf1); } void test_buf_basic__resize_incremental(void) @@ -34,7 +34,7 @@ void test_buf_basic__resize_incremental(void) cl_assert_equal_i(5, buf1.size); cl_assert(buf1.asize > 8); - git_buf_free(&buf1); + git_buf_dispose(&buf1); } void test_buf_basic__printf(void) @@ -47,5 +47,5 @@ void test_buf_basic__printf(void) git_buf_printf(&buf2, "%s %d", "woop", 42); cl_assert(git_buf_oom(&buf2) == 0); cl_assert_equal_s(git_buf_cstr(&buf2), "shoop da 23 woop 42"); - git_buf_free(&buf2); + git_buf_dispose(&buf2); } diff --git a/tests/buf/oom.c b/tests/buf/oom.c index b9fd29cbb..4294a907b 100644 --- a/tests/buf/oom.c +++ b/tests/buf/oom.c @@ -27,7 +27,7 @@ void test_buf_oom__grow(void) cl_assert(git_buf_grow(&buf, TOOBIG) == -1); cl_assert(git_buf_oom(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_buf_oom__grow_by(void) diff --git a/tests/buf/percent.c b/tests/buf/percent.c index 60534a053..8c47b833d 100644 --- a/tests/buf/percent.c +++ b/tests/buf/percent.c @@ -18,8 +18,8 @@ static void expect_decode_pass(const char *expected, const char *encoded) cl_assert_equal_s(expected, git_buf_cstr(&out)); cl_assert_equal_i(strlen(expected), git_buf_len(&out)); - git_buf_free(&in); - git_buf_free(&out); + git_buf_dispose(&in); + git_buf_dispose(&out); } void test_buf_percent__decode_succeeds(void) diff --git a/tests/buf/quote.c b/tests/buf/quote.c index 6f77ab9c1..8867ae7d6 100644 --- a/tests/buf/quote.c +++ b/tests/buf/quote.c @@ -11,7 +11,7 @@ static void expect_quote_pass(const char *expected, const char *str) cl_assert_equal_s(expected, git_buf_cstr(&buf)); cl_assert_equal_i(strlen(expected), git_buf_len(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_buf_quote__quote_succeeds(void) @@ -38,7 +38,7 @@ static void expect_unquote_pass(const char *expected, const char *quoted) cl_assert_equal_s(expected, git_buf_cstr(&buf)); cl_assert_equal_i(strlen(expected), git_buf_len(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } static void expect_unquote_fail(const char *quoted) @@ -48,7 +48,7 @@ static void expect_unquote_fail(const char *quoted) cl_git_pass(git_buf_puts(&buf, quoted)); cl_git_fail(git_buf_unquote(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_buf_quote__unquote_succeeds(void) diff --git a/tests/buf/splice.c b/tests/buf/splice.c index e80c93105..18c7c3f2b 100644 --- a/tests/buf/splice.c +++ b/tests/buf/splice.c @@ -8,7 +8,7 @@ void test_buf_splice__initialize(void) { } void test_buf_splice__cleanup(void) { - git_buf_free(&_buf); + git_buf_dispose(&_buf); } void test_buf_splice__preprend(void) diff --git a/tests/checkout/checkout_helpers.c b/tests/checkout/checkout_helpers.c index d7d24f33f..144be6a38 100644 --- a/tests/checkout/checkout_helpers.c +++ b/tests/checkout/checkout_helpers.c @@ -16,7 +16,7 @@ void assert_on_branch(git_repository *repo, const char *branch) cl_assert_equal_s(bname.ptr, git_reference_symbolic_target(head)); git_reference_free(head); - git_buf_free(&bname); + git_buf_dispose(&bname); } void reset_index_to_treeish(git_object *treeish) diff --git a/tests/checkout/conflict.c b/tests/checkout/conflict.c index dd2dd3131..9b86cfaeb 100644 --- a/tests/checkout/conflict.c +++ b/tests/checkout/conflict.c @@ -109,7 +109,7 @@ static void create_index(struct checkout_index_entry *entries, size_t entries_le cl_git_pass(git_index_add(g_index, &entry)); } - git_buf_free(&path); + git_buf_dispose(&path); } static void create_index_names(struct checkout_name_entry *entries, size_t entries_len) @@ -146,8 +146,8 @@ static void ensure_workdir_contents(const char *path, const char *contents) cl_git_pass(git_futils_readbuffer(&data_buf, git_buf_cstr(&fullpath))); cl_assert(strcmp(git_buf_cstr(&data_buf), contents) == 0); - git_buf_free(&fullpath); - git_buf_free(&data_buf); + git_buf_dispose(&fullpath); + git_buf_dispose(&data_buf); } static void ensure_workdir_oid(const char *path, const char *oid_str) @@ -174,7 +174,7 @@ static void ensure_workdir_mode(const char *path, int mode) cl_git_pass(p_stat(git_buf_cstr(&fullpath), &st)); cl_assert_equal_i((mode & S_IRWXU), (st.st_mode & S_IRWXU)); - git_buf_free(&fullpath); + git_buf_dispose(&fullpath); #endif } @@ -204,7 +204,7 @@ static void ensure_workdir_link(const char *path, const char *target) actual[len] = '\0'; cl_assert(strcmp(actual, target) == 0); - git_buf_free(&fullpath); + git_buf_dispose(&fullpath); #endif } diff --git a/tests/checkout/crlf.c b/tests/checkout/crlf.c index d467eaadd..ed9745d8d 100644 --- a/tests/checkout/crlf.c +++ b/tests/checkout/crlf.c @@ -29,7 +29,7 @@ void test_checkout_crlf__cleanup(void) if (expected_fixture.size) { cl_fixture_cleanup(expected_fixture.ptr); - git_buf_free(&expected_fixture); + git_buf_dispose(&expected_fixture); } } @@ -84,13 +84,13 @@ done: git_path_basename(actual_path->ptr), systype, cd->autocrlf, cd->attrs); clar__fail(__FILE__, __LINE__, "checked out contents did not match expected", details.ptr, 0); - git_buf_free(&details); + git_buf_dispose(&details); } git__free(basename); - git_buf_free(&expected_contents); - git_buf_free(&actual_contents); - git_buf_free(&expected_path); + git_buf_dispose(&expected_contents); + git_buf_dispose(&actual_contents); + git_buf_dispose(&expected_path); return 0; } @@ -139,13 +139,13 @@ static void test_checkout(const char *autocrlf, const char *attrs) cl_git_pass(git_path_direach(&reponame, 0, compare_file, &compare_data)); cl_fixture_cleanup(expected_fixture.ptr); - git_buf_free(&expected_fixture); + git_buf_dispose(&expected_fixture); - git_buf_free(&attrbuf); - git_buf_free(&expected_fixture); - git_buf_free(&expected_dirname); - git_buf_free(&sandboxname); - git_buf_free(&reponame); + git_buf_dispose(&attrbuf); + git_buf_dispose(&expected_fixture); + git_buf_dispose(&expected_dirname); + git_buf_dispose(&sandboxname); + git_buf_dispose(&reponame); } static void empty_workdir(const char *name) diff --git a/tests/checkout/icase.c b/tests/checkout/icase.c index 55ab3ab24..560c1ad86 100644 --- a/tests/checkout/icase.c +++ b/tests/checkout/icase.c @@ -89,7 +89,7 @@ static char *get_filename(const char *in) git__free(search_dirname); git__free(search_filename); - git_buf_free(&out); + git_buf_dispose(&out); return filename; #endif diff --git a/tests/checkout/index.c b/tests/checkout/index.c index ca63dc3f8..a649d8512 100644 --- a/tests/checkout/index.c +++ b/tests/checkout/index.c @@ -718,7 +718,7 @@ void test_checkout_index__writes_conflict_file(void) "=======\n" "this file is changed in branch and master\n" ">>>>>>> theirs\n") == 0); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); git_index_free(index); } @@ -768,7 +768,7 @@ void test_checkout_index__conflicts_honor_coreautocrlf(void) "=======\r\n" "this file is changed in branch and master\r\n" ">>>>>>> theirs\r\n") == 0); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); git_index_free(index); #endif diff --git a/tests/checkout/nasty.c b/tests/checkout/nasty.c index d4d3c8fa4..042fbba37 100644 --- a/tests/checkout/nasty.c +++ b/tests/checkout/nasty.c @@ -42,7 +42,7 @@ static void test_checkout_passes(const char *refname, const char *filename) cl_assert(!git_path_exists(path.ptr)); git_commit_free(commit); - git_buf_free(&path); + git_buf_dispose(&path); } static void test_checkout_fails(const char *refname, const char *filename) @@ -63,7 +63,7 @@ static void test_checkout_fails(const char *refname, const char *filename) cl_assert(!git_path_exists(path.ptr)); git_commit_free(commit); - git_buf_free(&path); + git_buf_dispose(&path); } /* A tree that contains ".git" as a tree, with a blob inside diff --git a/tests/checkout/tree.c b/tests/checkout/tree.c index a7e29b3db..35c0ece03 100644 --- a/tests/checkout/tree.c +++ b/tests/checkout/tree.c @@ -550,7 +550,7 @@ void assert_conflict( /* Create a conflicting file */ cl_git_pass(git_buf_joinpath(&file_path, "./testrepo", entry_path)); cl_git_mkfile(git_buf_cstr(&file_path), new_content); - git_buf_free(&file_path); + git_buf_dispose(&file_path); /* Trying to checkout the original commit */ cl_git_pass(git_revparse_single(&g_object, g_repo, commit_sha)); @@ -1044,7 +1044,7 @@ mode_t read_filemode(const char *path) result = GIT_PERMS_IS_EXEC(st.st_mode) ? GIT_FILEMODE_BLOB_EXECUTABLE : GIT_FILEMODE_BLOB; - git_buf_free(&fullpath); + git_buf_dispose(&fullpath); return result; } @@ -1343,8 +1343,8 @@ void test_checkout_tree__caches_attributes_during_checkout(void) cl_assert_equal_strn(ident1.ptr, "# $Id: ", 7); cl_assert_equal_strn(ident2.ptr, "# $Id: ", 7); - git_buf_free(&ident1); - git_buf_free(&ident2); + git_buf_dispose(&ident1); + git_buf_dispose(&ident2); git_object_free(obj); } diff --git a/tests/checkout/typechange.c b/tests/checkout/typechange.c index 647b534b1..7299f8d33 100644 --- a/tests/checkout/typechange.c +++ b/tests/checkout/typechange.c @@ -139,7 +139,7 @@ static void assert_workdir_matches_tree( } git_tree_free(tree); - git_buf_free(&path); + git_buf_dispose(&path); } void test_checkout_typechange__checkout_typechanges_safe(void) @@ -249,8 +249,8 @@ static int make_submodule_dirty(git_submodule *sm, const char *name, void *paylo git_buf_joinpath(&dirtypath, git_repository_workdir(submodule_repo), "dirty")); force_create_file(git_buf_cstr(&dirtypath)); - git_buf_free(&dirtypath); - git_buf_free(&submodulepath); + git_buf_dispose(&dirtypath); + git_buf_dispose(&submodulepath); git_repository_free(submodule_repo); return 0; diff --git a/tests/cherrypick/workdir.c b/tests/cherrypick/workdir.c index 2b45f5a33..d83f54b51 100644 --- a/tests/cherrypick/workdir.c +++ b/tests/cherrypick/workdir.c @@ -228,8 +228,8 @@ void test_cherrypick_workdir__conflicts(void) git_commit_free(commit); git_commit_free(head); - git_buf_free(&mergemsg_buf); - git_buf_free(&conflicting_buf); + git_buf_dispose(&mergemsg_buf); + git_buf_dispose(&conflicting_buf); } /* git reset --hard bafbf6912c09505ac60575cd43d3f2aba3bd84d8 @@ -358,7 +358,7 @@ void test_cherrypick_workdir__both_renamed(void) "\tfile3.txt.renamed\n" \ "\tfile3.txt.renamed_on_branch\n") == 0); - git_buf_free(&mergemsg_buf); + git_buf_dispose(&mergemsg_buf); git_commit_free(commit); git_commit_free(head); } diff --git a/tests/clar_libgit2.c b/tests/clar_libgit2.c index bd10c009d..92404b5d7 100644 --- a/tests/clar_libgit2.c +++ b/tests/clar_libgit2.c @@ -310,8 +310,8 @@ const char* cl_git_path_url(const char *path) cl_assert(url_buf.size < 4096); strncpy(url, git_buf_cstr(&url_buf), 4096); - git_buf_free(&url_buf); - git_buf_free(&path_buf); + git_buf_dispose(&url_buf); + git_buf_dispose(&path_buf); return url; } @@ -359,7 +359,7 @@ int cl_git_remove_placeholders(const char *directory_path, const char *filename) error = remove_placeholders_recurs(&data, &buffer); - git_buf_free(&buffer); + git_buf_dispose(&buffer); return error; } @@ -544,7 +544,7 @@ void cl_fake_home(void) cl_git_pass(git_path_prettify(&path, "home", NULL)); cl_git_pass(git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, path.ptr)); - git_buf_free(&path); + git_buf_dispose(&path); } void cl_sandbox_set_search_path_defaults(void) @@ -565,7 +565,7 @@ void cl_sandbox_set_search_path_defaults(void) git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_PROGRAMDATA, path.ptr); - git_buf_free(&path); + git_buf_dispose(&path); } #ifdef GIT_WIN32 @@ -584,7 +584,7 @@ bool cl_sandbox_supports_8dot3(void) supported = (shortname != NULL); git__free(shortname); - git_buf_free(&longpath); + git_buf_dispose(&longpath); return supported; } diff --git a/tests/clone/empty.c b/tests/clone/empty.c index 2a6217580..8e59d2b8c 100644 --- a/tests/clone/empty.c +++ b/tests/clone/empty.c @@ -53,13 +53,13 @@ void test_clone_empty__can_clone_an_empty_local_repo_barely(void) cl_git_pass(git_branch_upstream_name(&buf, g_repo_cloned, local_name)); cl_assert_equal_s(expected_tracked_branch_name, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); /* ...and the name of the remote... */ cl_git_pass(git_branch_remote_name(&buf, g_repo_cloned, expected_tracked_branch_name)); cl_assert_equal_s(expected_remote_name, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); /* ...even when the remote HEAD is unborn as well */ cl_assert_equal_i(GIT_ENOTFOUND, git_reference_lookup(&ref, g_repo_cloned, diff --git a/tests/clone/local.c b/tests/clone/local.c index 7f54d05de..941691814 100644 --- a/tests/clone/local.c +++ b/tests/clone/local.c @@ -91,7 +91,7 @@ void test_clone_local__should_clone_local(void) cl_assert_equal_i(1, git_clone__should_clone_local(path, GIT_CLONE_LOCAL_NO_LINKS)); cl_assert_equal_i(0, git_clone__should_clone_local(path, GIT_CLONE_NO_LOCAL)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_clone_local__hardlinks(void) @@ -149,7 +149,7 @@ void test_clone_local__hardlinks(void) cl_assert_equal_i(3, st.st_nlink); #endif - git_buf_free(&buf); + git_buf_dispose(&buf); git_repository_free(repo); cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES)); @@ -179,8 +179,8 @@ void test_clone_local__standard_unc_paths_are_written_git_style(void) git_remote_free(remote); git_repository_free(repo); - git_buf_free(&unc); - git_buf_free(&git_unc); + git_buf_dispose(&unc); + git_buf_dispose(&git_unc); cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES)); #endif @@ -206,7 +206,7 @@ void test_clone_local__git_style_unc_paths(void) git_remote_free(remote); git_repository_free(repo); - git_buf_free(&git_unc); + git_buf_dispose(&git_unc); cl_git_pass(git_futils_rmdir_r("./clone.git", NULL, GIT_RMDIR_REMOVE_FILES)); #endif diff --git a/tests/clone/nonetwork.c b/tests/clone/nonetwork.c index 7ebf19f46..9c3a1e510 100644 --- a/tests/clone/nonetwork.c +++ b/tests/clone/nonetwork.c @@ -154,7 +154,7 @@ void test_clone_nonetwork__can_prevent_the_checkout_of_a_standard_repo(void) cl_git_pass(git_buf_joinpath(&path, git_repository_workdir(g_repo), "master.txt")); cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&path))); - git_buf_free(&path); + git_buf_dispose(&path); } void test_clone_nonetwork__can_checkout_given_branch(void) @@ -309,7 +309,7 @@ static void assert_correct_reflog(const char *name) git_reflog_free(log); - git_buf_free(&expected_message); + git_buf_dispose(&expected_message); } void test_clone_nonetwork__clone_updates_reflog_properly(void) diff --git a/tests/commit/parse.c b/tests/commit/parse.c index 297fccc6b..e61589dfd 100644 --- a/tests/commit/parse.c +++ b/tests/commit/parse.c @@ -464,7 +464,7 @@ cpxtDQQMGYFpXK/71stq\n\ cl_git_pass(git_commit_header_field(&buf, commit, "committer")); cl_assert_equal_s("Vicent Marti <tanoku@gmail.com> 1273848544 +0200", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_commit__free(commit); } @@ -547,7 +547,7 @@ corrupt signature\n"; cl_assert_equal_s(oneline_data, signed_data.ptr); - git_buf_free(&signature); - git_buf_free(&signed_data); + git_buf_dispose(&signature); + git_buf_dispose(&signed_data); } diff --git a/tests/commit/write.c b/tests/commit/write.c index 030d41578..7b0af8cc0 100644 --- a/tests/commit/write.c +++ b/tests/commit/write.c @@ -130,7 +130,7 @@ This is a root commit\n\ This is a root commit and should be the only one in this branch\n\ "); - git_buf_free(&commit); + git_buf_dispose(&commit); git_tree_free(tree); git_commit_free(parent); git_signature_free(author); diff --git a/tests/config/conditionals.c b/tests/config/conditionals.c index 3a87de21f..cb1f916ad 100644 --- a/tests/config/conditionals.c +++ b/tests/config/conditionals.c @@ -43,7 +43,7 @@ static void assert_condition_includes(const char *keyword, const char *path, boo git_config_get_string_buf(&buf, cfg, "foo.bar")); } - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(cfg); } @@ -77,7 +77,7 @@ void test_config_conditionals__gitdir(void) assert_condition_includes("gitdir", path.ptr, false); git__free(sandbox_path); - git_buf_free(&path); + git_buf_dispose(&path); } void test_config_conditionals__gitdir_i(void) @@ -94,7 +94,7 @@ void test_config_conditionals__gitdir_i(void) assert_condition_includes("gitdir/i", path.ptr, true); git__free(sandbox_path); - git_buf_free(&path); + git_buf_dispose(&path); } void test_config_conditionals__invalid_conditional_fails(void) diff --git a/tests/config/config_helpers.c b/tests/config/config_helpers.c index 025838ad7..d92ff1a4e 100644 --- a/tests/config/config_helpers.c +++ b/tests/config/config_helpers.c @@ -36,7 +36,7 @@ void assert_config_entry_value( cl_git_pass(git_config_get_string_buf(&buf, config, name)); cl_assert_equal_s(expected_value, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } static int count_config_entries_cb( diff --git a/tests/config/configlevel.c b/tests/config/configlevel.c index b73656cb9..15c469fcb 100644 --- a/tests/config/configlevel.c +++ b/tests/config/configlevel.c @@ -33,7 +33,7 @@ void test_config_configlevel__can_replace_a_config_file_at_an_existing_level(voi cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.stringglobal")); cl_assert_equal_s("don't find me!", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(cfg); } @@ -56,7 +56,7 @@ void test_config_configlevel__can_read_from_a_single_level_focused_file_after_pa cl_git_pass(git_config_get_string_buf(&buf, single_level_cfg, "core.stringglobal")); cl_assert_equal_s("don't find me!", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(single_level_cfg); } diff --git a/tests/config/global.c b/tests/config/global.c index a149dc0be..9446d8de9 100644 --- a/tests/config/global.c +++ b/tests/config/global.c @@ -21,7 +21,7 @@ void test_config_global__initialize(void) cl_git_pass(git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_SYSTEM, path.ptr)); - git_buf_free(&path); + git_buf_dispose(&path); } void test_config_global__cleanup(void) @@ -60,7 +60,7 @@ void test_config_global__open_xdg(void) cl_git_pass(git_config_get_string_buf(&buf, selected, key)); cl_assert_equal_s(str, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(selected); git_config_free(xdg); git_config_free(cfg); @@ -87,7 +87,7 @@ void test_config_global__open_programdata(void) cl_git_pass(git_config_open_ondisk(&cfg, config_path.ptr)); cl_git_pass(git_config_set_string(cfg, "programdata.var", "even higher level")); - git_buf_free(&config_path); + git_buf_dispose(&config_path); git_config_free(cfg); git_config_open_default(&cfg); @@ -95,7 +95,7 @@ void test_config_global__open_programdata(void) cl_assert_equal_s("even higher level", var_contents.ptr); git_config_free(cfg); - git_buf_free(&var_contents); + git_buf_dispose(&var_contents); cl_git_pass(git_repository_init(&repo, "./foo.git", true)); cl_git_pass(git_repository_config(&cfg, repo)); @@ -103,7 +103,7 @@ void test_config_global__open_programdata(void) cl_assert_equal_s("even higher level", var_contents.ptr); git_config_free(cfg); - git_buf_free(&var_contents); + git_buf_dispose(&var_contents); git_repository_free(repo); cl_fixture_cleanup("./foo.git"); } diff --git a/tests/config/include.c b/tests/config/include.c index e440b9a78..d2ea2c2fd 100644 --- a/tests/config/include.c +++ b/tests/config/include.c @@ -14,7 +14,7 @@ void test_config_include__initialize(void) void test_config_include__cleanup(void) { git_config_free(cfg); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_config_include__relative(void) @@ -30,7 +30,7 @@ void test_config_include__absolute(void) cl_git_pass(git_buf_printf(&buf, "[include]\npath = %s/config-included", cl_fixture("config"))); cl_git_mkfile("config-include-absolute", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); cl_git_pass(git_config_open_ondisk(&cfg, "config-include-absolute")); cl_git_pass(git_config_get_string_buf(&buf, cfg, "foo.bar.baz")); diff --git a/tests/config/new.c b/tests/config/new.c index b39baa0a5..bb3a2d9a8 100644 --- a/tests/config/new.c +++ b/tests/config/new.c @@ -27,7 +27,7 @@ void test_config_new__write_new_config(void) cl_git_pass(git_config_get_string_buf(&buf, config, "core.editor")); cl_assert_equal_s("ed", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(config); p_unlink(TEST_CONFIG); diff --git a/tests/config/read.c b/tests/config/read.c index ebcd2eb84..ddc5c8ce6 100644 --- a/tests/config/read.c +++ b/tests/config/read.c @@ -6,7 +6,7 @@ static git_buf buf = GIT_BUF_INIT; void test_config_read__cleanup(void) { - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_config_read__simple_read(void) @@ -688,29 +688,29 @@ void test_config_read__path(void) cl_git_pass(git_config_open_ondisk(&cfg, "./testconfig")); cl_git_pass(git_config_get_path(&path, cfg, "some.path")); cl_assert_equal_s(expected_path.ptr, path.ptr); - git_buf_free(&path); + git_buf_dispose(&path); cl_git_mkfile("./testconfig", "[some]\n path = ~/"); cl_git_pass(git_path_join_unrooted(&expected_path, "", home_path.ptr, NULL)); cl_git_pass(git_config_get_path(&path, cfg, "some.path")); cl_assert_equal_s(expected_path.ptr, path.ptr); - git_buf_free(&path); + git_buf_dispose(&path); cl_git_mkfile("./testconfig", "[some]\n path = ~"); cl_git_pass(git_buf_sets(&expected_path, home_path.ptr)); cl_git_pass(git_config_get_path(&path, cfg, "some.path")); cl_assert_equal_s(expected_path.ptr, path.ptr); - git_buf_free(&path); + git_buf_dispose(&path); cl_git_mkfile("./testconfig", "[some]\n path = ~user/foo"); cl_git_fail(git_config_get_path(&path, cfg, "some.path")); cl_git_pass(git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, old_path.ptr)); - git_buf_free(&old_path); - git_buf_free(&home_path); - git_buf_free(&expected_path); + git_buf_dispose(&old_path); + git_buf_dispose(&home_path); + git_buf_dispose(&expected_path); git_config_free(cfg); } @@ -726,7 +726,7 @@ void test_config_read__crlf_style_line_endings(void) cl_assert_equal_s(buf.ptr, "value"); git_config_free(cfg); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_config_read__trailing_crlf(void) @@ -741,7 +741,7 @@ void test_config_read__trailing_crlf(void) cl_assert_equal_s(buf.ptr, "value"); git_config_free(cfg); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_config_read__bom(void) @@ -756,5 +756,5 @@ void test_config_read__bom(void) cl_assert_equal_s(buf.ptr, "value"); git_config_free(cfg); - git_buf_free(&buf); + git_buf_dispose(&buf); } diff --git a/tests/config/stress.c b/tests/config/stress.c index a6b665590..d86a11d4a 100644 --- a/tests/config/stress.c +++ b/tests/config/stress.c @@ -22,7 +22,7 @@ void test_config_stress__initialize(void) void test_config_stress__cleanup(void) { - git_buf_free(&buf); + git_buf_dispose(&buf); p_unlink(TEST_CONFIG); } diff --git a/tests/config/write.c b/tests/config/write.c index 6687ba1f7..cffa54e4d 100644 --- a/tests/config/write.c +++ b/tests/config/write.c @@ -293,7 +293,7 @@ void test_config_write__write_subsection(void) cl_git_pass(git_config_get_string_buf(&buf, cfg, "my.own.var")); cl_assert_equal_s("works", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(cfg); } @@ -335,7 +335,7 @@ void test_config_write__value_containing_quotes(void) cl_git_pass(git_config_open_ondisk(&cfg, "config9")); cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); cl_assert_equal_s("this also \"has\" quotes", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(cfg); } @@ -354,7 +354,7 @@ void test_config_write__escape_value(void) cl_git_pass(git_config_open_ondisk(&cfg, "config9")); cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.somevar")); cl_assert_equal_s("this \"has\" quotes and \t", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(cfg); } @@ -393,7 +393,7 @@ void test_config_write__add_value_at_specific_level(void) cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.stringglobal")); cl_assert_equal_s("I'm a global config value!", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(cfg); } @@ -489,7 +489,7 @@ void test_config_write__can_set_an_empty_value(void) cl_git_pass(git_config_get_string_buf(&buf, config, "core.somevar")); cl_assert_equal_s("", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(config); cl_git_sandbox_cleanup(); } @@ -581,7 +581,7 @@ void test_config_write__preserves_whitespace_and_comments(void) cl_assert_equal_s("[newsection]\n\tnewname = new_value\n", n); - git_buf_free(&newfile); + git_buf_dispose(&newfile); git_config_free(cfg); } @@ -600,7 +600,7 @@ void test_config_write__preserves_entry_with_name_only(void) cl_git_pass(git_futils_readbuffer(&newfile, file_name)); cl_assert_equal_s("[section \"foo\"]\n\tname\n\tother = otherval\n[newsection]\n\tnewname = new_value\n", newfile.ptr); - git_buf_free(&newfile); + git_buf_dispose(&newfile); git_config_free(cfg); } @@ -618,7 +618,7 @@ void test_config_write__to_empty_file(void) cl_git_pass(git_futils_readbuffer(&result, "config-file")); cl_assert_equal_s("[section]\n\tname = value\n", result.ptr); - git_buf_free(&result); + git_buf_dispose(&result); } void test_config_write__to_file_with_only_comment(void) @@ -635,7 +635,7 @@ void test_config_write__to_file_with_only_comment(void) cl_git_pass(git_futils_readbuffer(&result, "config-file")); cl_assert_equal_s("\n\n[section]\n\tname = value\n", result.ptr); - git_buf_free(&result); + git_buf_dispose(&result); } void test_config_write__locking(void) @@ -718,7 +718,7 @@ void test_config_write__repeated(void) cl_git_pass(git_futils_readbuffer(&result, filename)); cl_assert_equal_s(expected, result.ptr); - git_buf_free(&result); + git_buf_dispose(&result); git_config_free(cfg); } @@ -741,7 +741,7 @@ void test_config_write__preserve_case(void) cl_git_pass(git_futils_readbuffer(&result, filename)); cl_assert_equal_s(expected, result.ptr); - git_buf_free(&result); + git_buf_dispose(&result); git_config_free(cfg); } diff --git a/tests/core/buffer.c b/tests/core/buffer.c index c4308cbbf..b8a76b39c 100644 --- a/tests/core/buffer.c +++ b/tests/core/buffer.c @@ -28,7 +28,7 @@ void test_core_buffer__0(void) cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s(test_string_x2, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } /* test git_buf_printf */ @@ -44,7 +44,7 @@ void test_core_buffer__1(void) cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s("shoop da 23 woop 42", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } /* more thorough test of concatenation options */ @@ -57,7 +57,7 @@ void test_core_buffer__2(void) cl_assert(buf.size == 0); /* this must be safe to do */ - git_buf_free(&buf); + git_buf_dispose(&buf); cl_assert(buf.size == 0); cl_assert(buf.asize == 0); @@ -67,7 +67,7 @@ void test_core_buffer__2(void) /* cl_assert(buf.asize == 0); -- should not assume what git_buf does */ /* free should set us back to the beginning */ - git_buf_free(&buf); + git_buf_dispose(&buf); cl_assert(buf.size == 0); cl_assert(buf.asize == 0); @@ -88,7 +88,7 @@ void test_core_buffer__2(void) } cl_assert_equal_s("++++++++++++++++++", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); /* add data */ git_buf_put(&buf, "xo", 2); @@ -108,7 +108,7 @@ void test_core_buffer__2(void) cl_assert_equal_s("xoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxoxo", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); /* set to string */ git_buf_sets(&buf, test_string); @@ -129,7 +129,7 @@ void test_core_buffer__2(void) git_buf_clear(&buf); cl_assert_equal_s("", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); /* test extracting data into buffer */ git_buf_puts(&buf, REP4("0123456789")); @@ -153,7 +153,7 @@ void test_core_buffer__2(void) cl_assert_equal_s(REP4(REP16("x")) REP16("x") REP16("x") REP16("x") "xxxxxxxxxxxxxxx", data); - git_buf_free(&buf); + git_buf_dispose(&buf); git_buf_copy_cstr(data, sizeof(data), &buf); cl_assert_equal_s("", data); @@ -179,7 +179,7 @@ void test_core_buffer__3(void) cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s(test_4096, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } /* let's try some producer/consumer tests */ @@ -212,7 +212,7 @@ void test_core_buffer__4(void) git_buf_consume(&buf, buf.ptr + buf.size); cl_assert_equal_s("", git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } @@ -235,7 +235,7 @@ check_buf_append( if (expected_asize > 0) cl_assert(tgt.asize == expected_asize); - git_buf_free(&tgt); + git_buf_dispose(&tgt); } static void @@ -275,7 +275,7 @@ check_buf_append_abc( cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s(expected_abcabc, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } /* more variations on append tests */ @@ -340,8 +340,8 @@ void test_core_buffer__6(void) cl_assert_equal_s("bar", git_buf_cstr(&a)); cl_assert_equal_s("foo", git_buf_cstr(&b)); - git_buf_free(&a); - git_buf_free(&b); + git_buf_dispose(&a); + git_buf_dispose(&b); } @@ -367,7 +367,7 @@ void test_core_buffer__7(void) cl_assert_equal_s(NULL, b); cl_assert_equal_s("", a.ptr); - git_buf_free(&a); + git_buf_dispose(&a); b = git__strdup(fun); git_buf_attach(&a, b, 0); @@ -376,7 +376,7 @@ void test_core_buffer__7(void) cl_assert(a.size == strlen(fun)); cl_assert(a.asize == strlen(fun) + 1); - git_buf_free(&a); + git_buf_dispose(&a); b = git__strdup(fun); git_buf_attach(&a, b, strlen(fun) + 1); @@ -385,7 +385,7 @@ void test_core_buffer__7(void) cl_assert(a.size == strlen(fun)); cl_assert(a.asize == strlen(fun) + 1); - git_buf_free(&a); + git_buf_dispose(&a); } @@ -401,7 +401,7 @@ check_joinbuf_2( git_buf_join(&buf, sep, a, b); cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } static void @@ -418,7 +418,7 @@ check_joinbuf_overlapped( git_buf_join(&buf, sep, buf.ptr + ofs_a, b); cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } static void @@ -437,7 +437,7 @@ check_joinbuf_n_2( cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } static void @@ -453,7 +453,7 @@ check_joinbuf_n_4( git_buf_join_n(&buf, sep, 4, a, b, c, d); cl_assert(git_buf_oom(&buf) == 0); cl_assert_equal_s(expected, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } /* test join */ @@ -473,7 +473,7 @@ void test_core_buffer__8(void) cl_assert(git_buf_oom(&a) == 0); cl_assert_equal_s("foo/bar/baz", git_buf_cstr(&a)); - git_buf_free(&a); + git_buf_dispose(&a); check_joinbuf_2(NULL, "", ""); check_joinbuf_2(NULL, "a", "a"); @@ -578,7 +578,7 @@ void test_core_buffer__9(void) } } - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_buffer__10(void) @@ -595,7 +595,7 @@ void test_core_buffer__10(void) cl_git_pass(git_buf_join_n(&a, '/', 2, a.ptr, "more")); cl_assert_equal_s(a.ptr, "test/string/join/test/string/join/more"); - git_buf_free(&a); + git_buf_dispose(&a); } void test_core_buffer__join3(void) @@ -627,7 +627,7 @@ void test_core_buffer__join3(void) cl_git_pass(git_buf_join3(&a, '/', "string/", "", "/join")); cl_assert_equal_s("string/join", a.ptr); - git_buf_free(&a); + git_buf_dispose(&a); } void test_core_buffer__11(void) @@ -677,7 +677,7 @@ void test_core_buffer__11(void) cl_git_pass(git_buf_text_common_prefix(&a, &t)); cl_assert_equal_s(a.ptr, ""); - git_buf_free(&a); + git_buf_dispose(&a); } void test_core_buffer__rfind_variants(void) @@ -701,7 +701,7 @@ void test_core_buffer__rfind_variants(void) cl_assert(git_buf_rfind(&a, 'q') == -1); cl_assert(git_buf_rfind_next(&a, 'q') == -1); - git_buf_free(&a); + git_buf_dispose(&a); } void test_core_buffer__puts_escaped(void) @@ -724,7 +724,7 @@ void test_core_buffer__puts_escaped(void) cl_git_pass(git_buf_text_puts_escape_regex(&a, "^match\\s*[A-Z]+.*")); cl_assert_equal_s("\\^match\\\\s\\*\\[A-Z\\]\\+\\.\\*", a.ptr); - git_buf_free(&a); + git_buf_dispose(&a); } static void assert_unescape(char *expected, char *to_unescape) { @@ -735,7 +735,7 @@ static void assert_unescape(char *expected, char *to_unescape) { cl_assert_equal_s(expected, buf.ptr); cl_assert_equal_sz(strlen(expected), buf.size); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_buffer__unescape(void) @@ -769,7 +769,7 @@ void test_core_buffer__encode_base64(void) cl_git_pass(git_buf_encode_base64(&buf, "this!\n", 6)); cl_assert_equal_s("dGhpcyEK", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_buffer__decode_base64(void) @@ -790,7 +790,7 @@ void test_core_buffer__decode_base64(void) cl_git_fail(git_buf_decode_base64(&buf, "This is not a valid base64 string!!!", 36)); cl_assert_equal_s("this!\n", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_buffer__encode_base85(void) @@ -810,7 +810,7 @@ void test_core_buffer__encode_base85(void) cl_assert_equal_s("bZBXFAZc?TVqtS-AUHK3Wo~0{WMyOk", buf.ptr); git_buf_clear(&buf); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_buffer__decode_base85(void) @@ -832,7 +832,7 @@ void test_core_buffer__decode_base85(void) cl_assert_equal_s("this is base 85 encoded", buf.ptr); git_buf_clear(&buf); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_buffer__decode_base85_fails_gracefully(void) @@ -848,7 +848,7 @@ void test_core_buffer__decode_base85_fails_gracefully(void) cl_assert_equal_sz(6, buf.size); cl_assert_equal_s("foobar", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_buffer__classify_with_utf8(void) @@ -977,7 +977,7 @@ void test_core_buffer__similarity_metric(void) git_hashsig_free(a); git_hashsig_free(b); - git_buf_free(&buf); + git_buf_dispose(&buf); git_futils_rmdir_r("scratch", NULL, GIT_RMDIR_REMOVE_FILES); } @@ -1057,7 +1057,7 @@ void test_core_buffer__similarity_metric_whitespace(void) } } - git_buf_free(&buf); + git_buf_dispose(&buf); } #include "../filter/crlf.h" @@ -1150,8 +1150,8 @@ void test_core_buffer__lf_and_crlf_conversions(void) cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); check_buf("\rcr\r", tgt); - git_buf_free(&src); - git_buf_free(&tgt); + git_buf_dispose(&src); + git_buf_dispose(&tgt); /* blob correspondence tests */ @@ -1161,8 +1161,8 @@ void test_core_buffer__lf_and_crlf_conversions(void) git_buf_sets(&src, ALL_CRLF_TEXT_RAW); cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); check_buf(ALL_CRLF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); + git_buf_dispose(&src); + git_buf_dispose(&tgt); git_buf_sets(&src, ALL_LF_TEXT_RAW); cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); @@ -1170,8 +1170,8 @@ void test_core_buffer__lf_and_crlf_conversions(void) git_buf_sets(&src, ALL_LF_TEXT_RAW); cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); check_buf(ALL_LF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); + git_buf_dispose(&src); + git_buf_dispose(&tgt); git_buf_sets(&src, MORE_CRLF_TEXT_RAW); cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); @@ -1179,8 +1179,8 @@ void test_core_buffer__lf_and_crlf_conversions(void) git_buf_sets(&src, MORE_CRLF_TEXT_RAW); cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); check_buf(MORE_CRLF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); + git_buf_dispose(&src); + git_buf_dispose(&tgt); git_buf_sets(&src, MORE_LF_TEXT_RAW); cl_git_pass(git_buf_text_lf_to_crlf(&tgt, &src)); @@ -1188,8 +1188,8 @@ void test_core_buffer__lf_and_crlf_conversions(void) git_buf_sets(&src, MORE_LF_TEXT_RAW); cl_git_pass(git_buf_text_crlf_to_lf(&tgt, &src)); check_buf(MORE_LF_TEXT_AS_LF, tgt); - git_buf_free(&src); - git_buf_free(&tgt); + git_buf_dispose(&src); + git_buf_dispose(&tgt); } void test_core_buffer__dont_grow_borrowed(void) diff --git a/tests/core/dirent.c b/tests/core/dirent.c index 2bd60269d..a2448b498 100644 --- a/tests/core/dirent.c +++ b/tests/core/dirent.c @@ -55,7 +55,7 @@ static void dirent_cleanup__cb(void *_d) cl_must_pass(p_rmdir(top_dir)); - git_buf_free(&d->path); + git_buf_dispose(&d->path); } static void check_counts(walk_data *d) diff --git a/tests/core/env.c b/tests/core/env.c index 1af0e6e5d..7e7b3274d 100644 --- a/tests/core/env.c +++ b/tests/core/env.c @@ -162,8 +162,8 @@ void test_core_env__0(void) (void)p_rmdir(*val); } - git_buf_free(&path); - git_buf_free(&found); + git_buf_dispose(&path); + git_buf_dispose(&found); } @@ -206,7 +206,7 @@ void test_core_env__1(void) GIT_ENOTFOUND, git_sysdir_find_system_file(&path, "nonexistentfile")); #endif - git_buf_free(&path); + git_buf_dispose(&path); } static void check_global_searchpath( @@ -245,7 +245,7 @@ static void check_global_searchpath( cl_assert_equal_i( GIT_ENOTFOUND, git_sysdir_find_global_file(temp, file)); - git_buf_free(&out); + git_buf_dispose(&out); } void test_core_env__2(void) @@ -295,8 +295,8 @@ void test_core_env__2(void) (void)p_rmdir(*val); } - git_buf_free(&path); - git_buf_free(&found); + git_buf_dispose(&path); + git_buf_dispose(&found); } void test_core_env__substitution(void) @@ -316,6 +316,6 @@ void test_core_env__substitution(void) cl_git_pass(git_buf_join(&expected, GIT_PATH_LIST_SEPARATOR, "/tmp/a", "/tmp/b")); cl_assert_equal_s(expected.ptr, buf.ptr); - git_buf_free(&expected); - git_buf_free(&buf); + git_buf_dispose(&expected); + git_buf_dispose(&buf); } diff --git a/tests/core/filebuf.c b/tests/core/filebuf.c index ef7ac6bd9..51d8a0146 100644 --- a/tests/core/filebuf.c +++ b/tests/core/filebuf.c @@ -210,8 +210,8 @@ void test_core_filebuf__symlink_follow_absolute_paths(void) cl_assert_equal_i(true, git_path_exists("linkdir/target")); git_filebuf_cleanup(&file); - git_buf_free(&source); - git_buf_free(&target); + git_buf_dispose(&source); + git_buf_dispose(&target); cl_git_pass(git_futils_rmdir_r("linkdir", NULL, GIT_RMDIR_REMOVE_FILES)); } diff --git a/tests/core/futils.c b/tests/core/futils.c index e7f7154ed..c69c210ee 100644 --- a/tests/core/futils.c +++ b/tests/core/futils.c @@ -33,8 +33,8 @@ void test_core_futils__writebuffer(void) cl_assert_equal_file(out.ptr, out.size, "futils/test-file"); - git_buf_free(&out); - git_buf_free(&append); + git_buf_dispose(&out); + git_buf_dispose(&append); } void test_core_futils__write_hidden_file(void) @@ -61,8 +61,8 @@ void test_core_futils__write_hidden_file(void) cl_git_pass(git_win32__hidden(&hidden, "futils/test-file")); cl_assert(hidden); - git_buf_free(&out); - git_buf_free(&append); + git_buf_dispose(&out); + git_buf_dispose(&append); #endif } diff --git a/tests/core/link.c b/tests/core/link.c index ec85ec4e0..8cd6b01a9 100644 --- a/tests/core/link.c +++ b/tests/core/link.c @@ -147,7 +147,7 @@ static void do_junction(const char *old, const char *new) CloseHandle(handle); LocalFree(reparse_buf); - git_buf_free(&unparsed_buf); + git_buf_dispose(&unparsed_buf); } static void do_custom_reparse(const char *path) @@ -322,7 +322,7 @@ void test_core_link__lstat_symlink(void) cl_assert(S_ISLNK(st.st_mode)); cl_assert_equal_i(git_buf_len(&target_path), st.st_size); - git_buf_free(&target_path); + git_buf_dispose(&target_path); } void test_core_link__lstat_symlink_directory(void) @@ -345,7 +345,7 @@ void test_core_link__lstat_symlink_directory(void) cl_assert(S_ISLNK(st.st_mode)); cl_assert_equal_i(git_buf_len(&target_path), st.st_size); - git_buf_free(&target_path); + git_buf_dispose(&target_path); } void test_core_link__lstat_dangling_symlink(void) @@ -397,7 +397,7 @@ void test_core_link__stat_junction(void) cl_must_pass(p_stat("stat_junction", &st)); cl_assert(S_ISDIR(st.st_mode)); - git_buf_free(&target_path); + git_buf_dispose(&target_path); #endif } @@ -417,7 +417,7 @@ void test_core_link__stat_dangling_junction(void) cl_must_fail(p_stat("stat_nonexistent_junctarget", &st)); cl_must_fail(p_stat("stat_dangling_junction", &st)); - git_buf_free(&target_path); + git_buf_dispose(&target_path); #endif } @@ -438,7 +438,7 @@ void test_core_link__lstat_junction(void) cl_must_pass(p_lstat("lstat_junction", &st)); cl_assert(S_ISLNK(st.st_mode)); - git_buf_free(&target_path); + git_buf_dispose(&target_path); #endif } @@ -461,7 +461,7 @@ void test_core_link__lstat_dangling_junction(void) cl_assert(S_ISLNK(st.st_mode)); cl_assert_equal_i(git_buf_len(&target_path), st.st_size); - git_buf_free(&target_path); + git_buf_dispose(&target_path); #endif } @@ -573,7 +573,7 @@ void test_core_link__readlink_symlink(void) cl_assert_equal_s(git_buf_cstr(&target_path), buf); - git_buf_free(&target_path); + git_buf_dispose(&target_path); } void test_core_link__readlink_dangling(void) @@ -596,7 +596,7 @@ void test_core_link__readlink_dangling(void) cl_assert_equal_s(git_buf_cstr(&target_path), buf); - git_buf_free(&target_path); + git_buf_dispose(&target_path); } void test_core_link__readlink_multiple(void) @@ -625,8 +625,8 @@ void test_core_link__readlink_multiple(void) cl_assert_equal_s(git_buf_cstr(&path2), buf); - git_buf_free(&path1); - git_buf_free(&path2); - git_buf_free(&path3); - git_buf_free(&target_path); + git_buf_dispose(&path1); + git_buf_dispose(&path2); + git_buf_dispose(&path3); + git_buf_dispose(&target_path); } diff --git a/tests/core/mkdir.c b/tests/core/mkdir.c index 96c972396..8e52efb1e 100644 --- a/tests/core/mkdir.c +++ b/tests/core/mkdir.c @@ -49,7 +49,7 @@ void test_core_mkdir__absolute(void) cl_git_fail(git_futils_mkdir(path.ptr, 0755, 0)); cl_assert(!git_path_isdir(path.ptr)); - git_buf_free(&path); + git_buf_dispose(&path); } void test_core_mkdir__basic(void) @@ -256,7 +256,7 @@ void test_core_mkdir__keeps_parent_symlinks(void) cl_assert(git_path_isdir("d2/other/dir")); cl_assert(git_path_isdir("d0/other/dir")); - git_buf_free(&path); + git_buf_dispose(&path); #endif } diff --git a/tests/core/path.c b/tests/core/path.c index fefe2aeac..6910fabb7 100644 --- a/tests/core/path.c +++ b/tests/core/path.c @@ -9,7 +9,7 @@ check_dirname(const char *A, const char *B) cl_assert(git_path_dirname_r(&dir, A) >= 0); cl_assert_equal_s(B, dir.ptr); - git_buf_free(&dir); + git_buf_dispose(&dir); cl_assert((dir2 = git_path_dirname(A)) != NULL); cl_assert_equal_s(B, dir2); @@ -24,7 +24,7 @@ check_basename(const char *A, const char *B) cl_assert(git_path_basename_r(&base, A) >= 0); cl_assert_equal_s(B, base.ptr); - git_buf_free(&base); + git_buf_dispose(&base); cl_assert((base2 = git_path_basename(A)) != NULL); cl_assert_equal_s(B, base2); @@ -48,7 +48,7 @@ check_joinpath(const char *path_a, const char *path_b, const char *expected_path cl_git_pass(git_buf_joinpath(&joined_path, path_a, path_b)); cl_assert_equal_s(expected_path, joined_path.ptr); - git_buf_free(&joined_path); + git_buf_dispose(&joined_path); } static void @@ -65,7 +65,7 @@ check_joinpath_n( path_a, path_b, path_c, path_d)); cl_assert_equal_s(expected_path, joined_path.ptr); - git_buf_free(&joined_path); + git_buf_dispose(&joined_path); } @@ -204,7 +204,7 @@ check_path_to_dir( cl_git_pass(git_path_to_dir(&tgt)); cl_assert_equal_s(expected, tgt.ptr); - git_buf_free(&tgt); + git_buf_dispose(&tgt); } static void @@ -275,7 +275,7 @@ void test_core_path__08_self_join(void) cl_assert_equal_s(path.ptr, "/foo/this is a new string/grow the buffer, grow the buffer, grow the buffer"); cl_assert(asize < path.asize); - git_buf_free(&path); + git_buf_dispose(&path); cl_git_pass(git_buf_sets(&path, "/foo/bar")); cl_git_pass(git_buf_joinpath(&path, path.ptr + 4, "baz")); @@ -286,7 +286,7 @@ void test_core_path__08_self_join(void) cl_assert_equal_s(path.ptr, "/baz/somethinglongenoughtorealloc"); cl_assert(asize < path.asize); - git_buf_free(&path); + git_buf_dispose(&path); } static void check_percent_decoding(const char *expected_result, const char *input) @@ -296,7 +296,7 @@ static void check_percent_decoding(const char *expected_result, const char *inpu cl_git_pass(git__percent_decode(&buf, input)); cl_assert_equal_s(expected_result, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_path__09_percent_decode(void) @@ -325,7 +325,7 @@ static void check_fromurl(const char *expected_result, const char *input, int sh } else cl_git_fail(git_path_fromurl(&buf, input)); - git_buf_free(&buf); + git_buf_dispose(&buf); } #ifdef GIT_WIN32 @@ -436,7 +436,7 @@ void test_core_path__11_walkup(void) i = info.expect_idx; } - git_buf_free(&p); + git_buf_dispose(&p); } void test_core_path__11a_walkup_cancel(void) @@ -472,7 +472,7 @@ void test_core_path__11a_walkup_cancel(void) while (expect[i] != NULL) i++; } - git_buf_free(&p); + git_buf_dispose(&p); } void test_core_path__12_offset_to_path_root(void) @@ -500,7 +500,7 @@ void test_core_path__13_cannot_prettify_a_non_existing_file(void) cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH, NULL)); cl_assert_equal_i(GIT_ENOTFOUND, git_path_prettify(&p, NON_EXISTING_FILEPATH "/so-do-i", NULL)); - git_buf_free(&p); + git_buf_dispose(&p); } void test_core_path__14_apply_relative(void) @@ -561,7 +561,7 @@ void test_core_path__14_apply_relative(void) cl_git_pass(git_path_apply_relative(&p, "../there")); cl_assert_equal_s("../../there", p.ptr); - git_buf_free(&p); + git_buf_dispose(&p); } static void assert_resolve_relative( @@ -654,7 +654,7 @@ void test_core_path__15_resolve_relative(void) assert_resolve_relative(&buf, "/", "//a/b/../.."); #endif - git_buf_free(&buf); + git_buf_dispose(&buf); } #define assert_common_dirlen(i, p, q) \ diff --git a/tests/core/rmdir.c b/tests/core/rmdir.c index f0b0bfa42..0ec5d6144 100644 --- a/tests/core/rmdir.c +++ b/tests/core/rmdir.c @@ -24,7 +24,7 @@ void test_core_rmdir__initialize(void) cl_git_pass(git_buf_joinpath(&path, empty_tmp_dir, "/two")); cl_must_pass(p_mkdir(path.ptr, 0777)); - git_buf_free(&path); + git_buf_dispose(&path); } /* make sure empty dir can be deleted recusively */ @@ -47,7 +47,7 @@ void test_core_rmdir__fail_to_delete_non_empty_dir(void) cl_must_pass(p_unlink(file.ptr)); cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY)); - git_buf_free(&file); + git_buf_dispose(&file); } void test_core_rmdir__can_skip_non_empty_dir(void) @@ -64,7 +64,7 @@ void test_core_rmdir__can_skip_non_empty_dir(void) cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_REMOVE_FILES)); cl_assert(git_path_exists(empty_tmp_dir) == false); - git_buf_free(&file); + git_buf_dispose(&file); } void test_core_rmdir__can_remove_empty_parents(void) @@ -92,7 +92,7 @@ void test_core_rmdir__can_remove_empty_parents(void) cl_assert(git_path_exists(empty_tmp_dir) == true); - git_buf_free(&file); + git_buf_dispose(&file); cl_git_pass(git_futils_rmdir_r(empty_tmp_dir, NULL, GIT_RMDIR_EMPTY_HIERARCHY)); } diff --git a/tests/core/sortedcache.c b/tests/core/sortedcache.c index c1869bee0..35e92ece9 100644 --- a/tests/core/sortedcache.c +++ b/tests/core/sortedcache.c @@ -266,7 +266,7 @@ static void sortedcache_test_reload(git_sortedcache *sc) git_sortedcache_wunlock(sc); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_core_sortedcache__on_disk(void) diff --git a/tests/core/stat.c b/tests/core/stat.c index ef2e45a15..59a134649 100644 --- a/tests/core/stat.c +++ b/tests/core/stat.c @@ -110,5 +110,5 @@ void test_core_stat__root(void) cl_must_pass(p_stat(root.ptr, &st)); cl_assert(S_ISDIR(st.st_mode)); - git_buf_free(&root); + git_buf_dispose(&root); } diff --git a/tests/core/useragent.c b/tests/core/useragent.c index 5c09223bb..c6c5220b2 100644 --- a/tests/core/useragent.c +++ b/tests/core/useragent.c @@ -13,5 +13,5 @@ void test_core_useragent__get(void) cl_git_pass(git_libgit2_opts(GIT_OPT_GET_USER_AGENT, &buf)); cl_assert_equal_s(custom_name, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); } diff --git a/tests/core/zstream.c b/tests/core/zstream.c index 961904ec3..398d90ab0 100644 --- a/tests/core/zstream.c +++ b/tests/core/zstream.c @@ -73,8 +73,8 @@ void test_core_zstream__fails_on_trailing_garbage(void) cl_git_fail(git_zstream_inflatebuf(&inflated, deflated.ptr, deflated.size)); - git_buf_free(&deflated); - git_buf_free(&inflated); + git_buf_dispose(&deflated); + git_buf_dispose(&inflated); } void test_core_zstream__buffer(void) @@ -82,7 +82,7 @@ void test_core_zstream__buffer(void) git_buf out = GIT_BUF_INIT; cl_git_pass(git_zstream_deflatebuf(&out, data, strlen(data) + 1)); assert_zlib_equal(data, strlen(data) + 1, out.ptr, out.size); - git_buf_free(&out); + git_buf_dispose(&out); } #define BIG_STRING_PART "Big Data IS Big - Long Data IS Long - We need a buffer larger than 1024 x 1024 to make sure we trigger chunked compression - Big Big Data IS Bigger than Big - Long Long Data IS Longer than Long" @@ -129,15 +129,15 @@ static void compress_and_decompress_input_various_ways(git_buf *input) cl_assert_equal_sz(out1.size, out2.size); cl_assert(!memcmp(out1.ptr, out2.ptr, out1.size)); - git_buf_free(&out2); + git_buf_dispose(&out2); } cl_git_pass(git_zstream_inflatebuf(&inflated, out1.ptr, out1.size)); cl_assert_equal_i(input->size, inflated.size); cl_assert(memcmp(input->ptr, inflated.ptr, inflated.size) == 0); - git_buf_free(&out1); - git_buf_free(&inflated); + git_buf_dispose(&out1); + git_buf_dispose(&inflated); git__free(fixed); } @@ -164,5 +164,5 @@ void test_core_zstream__big_data(void) compress_and_decompress_input_various_ways(&in); } - git_buf_free(&in); + git_buf_dispose(&in); } diff --git a/tests/describe/describe.c b/tests/describe/describe.c index a8c57d874..26ca4efd8 100644 --- a/tests/describe/describe.c +++ b/tests/describe/describe.c @@ -50,6 +50,6 @@ void test_describe_describe__describe_a_repo_with_no_refs(void) git_describe_result_free(result); git_object_free(object); - git_buf_free(&buf); + git_buf_dispose(&buf); cl_git_sandbox_cleanup(); } diff --git a/tests/describe/describe_helpers.c b/tests/describe/describe_helpers.c index ad9c945c7..2e6ad539e 100644 --- a/tests/describe/describe_helpers.c +++ b/tests/describe/describe_helpers.c @@ -20,7 +20,7 @@ void assert_describe( git_describe_result_free(result); git_object_free(object); - git_buf_free(&label); + git_buf_dispose(&label); } void assert_describe_workdir( @@ -38,5 +38,5 @@ void assert_describe_workdir( cl_must_pass(p_fnmatch(expected_output, git_buf_cstr(&label), 0)); git_describe_result_free(result); - git_buf_free(&label); + git_buf_dispose(&label); } diff --git a/tests/diff/binary.c b/tests/diff/binary.c index 173a5994e..711fe6473 100644 --- a/tests/diff/binary.c +++ b/tests/diff/binary.c @@ -57,7 +57,7 @@ void test_patch( cl_assert_equal_s(expected, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); git_tree_free(tree_one); @@ -238,7 +238,7 @@ void test_diff_binary__delta(void) expected); git_index_free(index); - git_buf_free(&contents); + git_buf_dispose(&contents); } void test_diff_binary__delta_append(void) @@ -298,7 +298,7 @@ void test_diff_binary__empty_for_no_diff(void) cl_assert_equal_s("", actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_diff_free(diff); git_commit_free(commit); git_tree_free(tree); @@ -346,7 +346,7 @@ void test_diff_binary__index_to_workdir(void) &opts, expected); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); git_index_free(index); @@ -402,7 +402,7 @@ void test_diff_binary__print_patch_from_diff(void) cl_assert_equal_s(expected, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_diff_free(diff); git_index_free(index); } @@ -540,6 +540,6 @@ void test_diff_binary__blob_to_blob(void) git__free(diff_data.old_path); git__free(diff_data.new_path); - git_buf_free(&diff_data.old_binary_base85); - git_buf_free(&diff_data.new_binary_base85); + git_buf_dispose(&diff_data.old_binary_base85); + git_buf_dispose(&diff_data.new_binary_base85); } diff --git a/tests/diff/blob.c b/tests/diff/blob.c index 05cc28218..a876a973d 100644 --- a/tests/diff/blob.c +++ b/tests/diff/blob.c @@ -101,7 +101,7 @@ void test_diff_blob__patch_with_freed_blobs(void) cl_assert_equal_s(buf.ptr, BLOB_DIFF); git_patch_free(p); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_blob__can_compare_text_blobs(void) @@ -1016,7 +1016,7 @@ void test_diff_blob__using_path_and_attributes(void) git_buf_clear(&buf); git_patch_free(p); - git_buf_free(&buf); + git_buf_dispose(&buf); git_blob_free(nonbin); git_blob_free(bin); } diff --git a/tests/diff/diffiter.c b/tests/diff/diffiter.c index c976e30e2..432201b7f 100644 --- a/tests/diff/diffiter.c +++ b/tests/diff/diffiter.c @@ -423,7 +423,7 @@ void test_diff_diffiter__iterate_and_generate_patch_text(void) cl_assert_equal_s(expected_patch_text[d], buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_patch_free(patch); } diff --git a/tests/diff/drivers.c b/tests/diff/drivers.c index 42af38a9a..cace40967 100644 --- a/tests/diff/drivers.c +++ b/tests/diff/drivers.c @@ -65,7 +65,7 @@ void test_diff_drivers__patterns(void) cl_git_pass(git_patch_to_buf(&actual, patch)); cl_assert_equal_s(expected0, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); @@ -80,7 +80,7 @@ void test_diff_drivers__patterns(void) cl_git_pass(git_patch_to_buf(&actual, patch)); cl_assert_equal_s(expected1, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); @@ -95,7 +95,7 @@ void test_diff_drivers__patterns(void) cl_git_pass(git_patch_to_buf(&actual, patch)); cl_assert_equal_s(expected0, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); @@ -112,7 +112,7 @@ void test_diff_drivers__patterns(void) cl_git_pass(git_patch_to_buf(&actual, patch)); cl_assert_equal_s(expected1, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); @@ -133,7 +133,7 @@ void test_diff_drivers__patterns(void) cl_git_pass(git_patch_to_buf(&actual, patch)); cl_assert_equal_s(expected2, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); @@ -169,7 +169,7 @@ void test_diff_drivers__long_lines(void) cl_assert_equal_s(expected, actual.ptr); - git_buf_free(&actual); + git_buf_dispose(&actual); git_patch_free(patch); git_diff_free(diff); } @@ -245,9 +245,9 @@ void test_diff_drivers__builtins(void) git__free(path); } - git_buf_free(&file); - git_buf_free(&actual); - git_buf_free(&expected); + git_buf_dispose(&file); + git_buf_dispose(&actual); + git_buf_dispose(&expected); git_vector_free(&files); } diff --git a/tests/diff/format_email.c b/tests/diff/format_email.c index c3c04107b..28f840ab0 100644 --- a/tests/diff/format_email.c +++ b/tests/diff/format_email.c @@ -49,7 +49,7 @@ static void assert_email_match( git_diff_free(diff); git_commit_free(commit); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_format_email__simple(void) @@ -255,7 +255,7 @@ void test_diff_format_email__multiple(void) git_diff_free(diff); git_commit_free(commit); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_format_email__exclude_marker(void) @@ -331,7 +331,7 @@ void test_diff_format_email__invalid_no(void) git_diff_free(diff); git_commit_free(commit); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_format_email__mode_change(void) diff --git a/tests/diff/parse.c b/tests/diff/parse.c index dc2ceefec..bb18196b0 100644 --- a/tests/diff/parse.c +++ b/tests/diff/parse.c @@ -54,7 +54,7 @@ static void test_parse_invalid_diff(const char *invalid_diff) cl_git_fail_with(GIT_ERROR, git_diff_from_buffer(&diff, buf.ptr, buf.size)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_parse__exact_rename(void) @@ -125,7 +125,7 @@ static void test_tree_to_tree_computed_to_parsed( git_diff_free(computed); git_diff_free(parsed); - git_buf_free(&computed_buf); + git_buf_dispose(&computed_buf); cl_git_sandbox_cleanup(); } @@ -213,7 +213,7 @@ void test_diff_parse__get_patch_from_diff(void) git_diff_free(computed); git_diff_free(parsed); - git_buf_free(&computed_buf); + git_buf_dispose(&computed_buf); cl_git_sandbox_cleanup(); } @@ -265,7 +265,7 @@ void test_diff_parse__parsing_minimal_patch_succeeds(void) cl_assert_equal_s(patch, buf.ptr); git_diff_free(diff); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_parse__patch_roundtrip_succeeds(void) @@ -285,6 +285,6 @@ void test_diff_parse__patch_roundtrip_succeeds(void) git_patch_free(patch); git_diff_free(diff); - git_buf_free(&patchbuf); - git_buf_free(&diffbuf); + git_buf_dispose(&patchbuf); + git_buf_dispose(&diffbuf); } diff --git a/tests/diff/patch.c b/tests/diff/patch.c index 4c836289d..bc7976fe0 100644 --- a/tests/diff/patch.c +++ b/tests/diff/patch.c @@ -171,7 +171,7 @@ void test_diff_patch__to_string(void) cl_assert_equal_sz(31 + 16, git_patch_size(patch, 1, 1, 0)); cl_assert_equal_sz(strlen(expected), git_patch_size(patch, 1, 1, 1)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_patch_free(patch); git_diff_free(diff); git_tree_free(another); @@ -252,7 +252,7 @@ void test_diff_patch__config_options(void) git_patch_free(patch); git_diff_free(diff); - git_buf_free(&buf); + git_buf_dispose(&buf); git_tree_free(one); git_config_free(cfg); } @@ -440,8 +440,8 @@ void test_diff_patch__hunks_have_correct_line_numbers(void) git_patch_free(patch); git_diff_free(diff); - git_buf_free(&actual); - git_buf_free(&old_content); + git_buf_dispose(&actual); + git_buf_dispose(&old_content); git_tree_free(head); } @@ -476,7 +476,7 @@ static void check_single_patch_stats( git_buf buf = GIT_BUF_INIT; cl_git_pass(git_patch_to_buf(&buf, patch)); cl_assert_equal_s(expected, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); cl_assert_equal_sz( strlen(expected), git_patch_size(patch, 1, 1, 1)); @@ -614,7 +614,7 @@ void test_diff_patch__line_counts_with_eofnl(void) check_single_patch_stats( g_repo, 1, 1, 1, 6, expected_sizes, expected); - git_buf_free(&content); + git_buf_dispose(&content); } void test_diff_patch__can_strip_bad_utf8(void) @@ -700,5 +700,5 @@ void test_diff_patch__can_strip_bad_utf8(void) cl_assert_equal_s(expected, buf.ptr); git_patch_free(patch); - git_buf_free(&buf); + git_buf_dispose(&buf); } diff --git a/tests/diff/rename.c b/tests/diff/rename.c index ddc1d5d78..0ba9330ac 100644 --- a/tests/diff/rename.c +++ b/tests/diff/rename.c @@ -603,8 +603,8 @@ void test_diff_rename__working_directory_changes(void) git_diff_free(diff); git_tree_free(tree); - git_buf_free(&content); - git_buf_free(&old_content); + git_buf_dispose(&content); + git_buf_dispose(&old_content); } void test_diff_rename__patch(void) @@ -645,7 +645,7 @@ void test_diff_rename__patch(void) cl_git_pass(git_patch_to_buf(&buf, patch)); cl_assert_equal_s(expected, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_patch_free(patch); @@ -707,8 +707,8 @@ void test_diff_rename__file_exchange(void) git_tree_free(tree); git_index_free(index); - git_buf_free(&c1); - git_buf_free(&c2); + git_buf_dispose(&c1); + git_buf_dispose(&c2); } void test_diff_rename__file_exchange_three(void) @@ -759,9 +759,9 @@ void test_diff_rename__file_exchange_three(void) git_tree_free(tree); git_index_free(index); - git_buf_free(&c1); - git_buf_free(&c2); - git_buf_free(&c3); + git_buf_dispose(&c1); + git_buf_dispose(&c2); + git_buf_dispose(&c3); } void test_diff_rename__file_partial_exchange(void) @@ -812,8 +812,8 @@ void test_diff_rename__file_partial_exchange(void) git_tree_free(tree); git_index_free(index); - git_buf_free(&c1); - git_buf_free(&c2); + git_buf_dispose(&c1); + git_buf_dispose(&c2); } void test_diff_rename__rename_and_copy_from_same_source(void) @@ -869,8 +869,8 @@ void test_diff_rename__rename_and_copy_from_same_source(void) git_tree_free(tree); git_index_free(index); - git_buf_free(&c1); - git_buf_free(&c2); + git_buf_dispose(&c1); + git_buf_dispose(&c2); } void test_diff_rename__from_deleted_to_split(void) @@ -923,7 +923,7 @@ void test_diff_rename__from_deleted_to_split(void) git_tree_free(tree); git_index_free(index); - git_buf_free(&c1); + git_buf_dispose(&c1); } struct rename_expected @@ -1023,8 +1023,8 @@ void test_diff_rename__rejected_match_can_match_others(void) git_index_free(index); git_reference_free(head); git_reference_free(selfsimilar); - git_buf_free(&one); - git_buf_free(&two); + git_buf_dispose(&one); + git_buf_dispose(&two); } static void write_similarity_file_two(const char *filename, size_t b_lines) @@ -1041,7 +1041,7 @@ static void write_similarity_file_two(const char *filename, size_t b_lines) cl_git_pass( git_futils_writebuffer(&contents, filename, O_RDWR|O_CREAT, 0777)); - git_buf_free(&contents); + git_buf_dispose(&contents); } void test_diff_rename__rejected_match_can_match_others_two(void) @@ -1389,7 +1389,7 @@ void test_diff_rename__can_find_copy_to_split(void) git_tree_free(tree); git_index_free(index); - git_buf_free(&c1); + git_buf_dispose(&c1); } void test_diff_rename__can_delete_unmodified_deltas(void) @@ -1437,7 +1437,7 @@ void test_diff_rename__can_delete_unmodified_deltas(void) git_tree_free(tree); git_index_free(index); - git_buf_free(&c1); + git_buf_dispose(&c1); } void test_diff_rename__matches_config_behavior(void) @@ -1759,7 +1759,7 @@ void test_diff_rename__identical(void) cl_assert_equal_s(expected, diff_buf.ptr); - git_buf_free(&diff_buf); + git_buf_dispose(&diff_buf); git_diff_free(diff); git_tree_free(old_tree); git_tree_free(new_tree); @@ -1910,7 +1910,7 @@ void test_diff_rename__rewrite_and_delete(void) cl_assert_equal_s(expected, diff_buf.ptr); - git_buf_free(&diff_buf); + git_buf_dispose(&diff_buf); git_diff_free(diff); git_tree_free(old_tree); git_tree_free(new_tree); @@ -1973,7 +1973,7 @@ void test_diff_rename__delete_and_rename(void) cl_assert_equal_s(expected, diff_buf.ptr); - git_buf_free(&diff_buf); + git_buf_dispose(&diff_buf); git_diff_free(diff); git_tree_free(old_tree); git_tree_free(new_tree); diff --git a/tests/diff/stats.c b/tests/diff/stats.c index 347d0d757..24316f715 100644 --- a/tests/diff/stats.c +++ b/tests/diff/stats.c @@ -54,11 +54,11 @@ void test_diff_stats__stat(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0); - git_buf_free(&buf); + git_buf_dispose(&buf); cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 80)); cl_assert(strcmp(git_buf_cstr(&buf), stat) == 0); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__multiple_hunks(void) @@ -78,7 +78,7 @@ void test_diff_stats__multiple_hunks(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__numstat(void) @@ -93,7 +93,7 @@ void test_diff_stats__numstat(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__shortstat(void) @@ -111,7 +111,7 @@ void test_diff_stats__shortstat(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__shortstat_noinsertions(void) @@ -129,7 +129,7 @@ void test_diff_stats__shortstat_noinsertions(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__shortstat_nodeletions(void) @@ -147,7 +147,7 @@ void test_diff_stats__shortstat_nodeletions(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_SHORT, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__rename(void) @@ -167,7 +167,7 @@ void test_diff_stats__rename(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__rename_nochanges(void) @@ -187,7 +187,7 @@ void test_diff_stats__rename_nochanges(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__rename_and_modifiy(void) @@ -207,7 +207,7 @@ void test_diff_stats__rename_and_modifiy(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__rename_no_find(void) @@ -229,7 +229,7 @@ void test_diff_stats__rename_no_find(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__rename_nochanges_no_find(void) @@ -251,7 +251,7 @@ void test_diff_stats__rename_nochanges_no_find(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__rename_and_modify_no_find(void) @@ -272,7 +272,7 @@ void test_diff_stats__rename_and_modify_no_find(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__binary(void) @@ -292,7 +292,7 @@ void test_diff_stats__binary(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__binary_numstat(void) @@ -306,7 +306,7 @@ void test_diff_stats__binary_numstat(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_NUMBER, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_diff_stats__mode_change(void) @@ -322,5 +322,5 @@ void test_diff_stats__mode_change(void) cl_git_pass(git_diff_stats_to_buf(&buf, _stats, GIT_DIFF_STATS_FULL | GIT_DIFF_STATS_INCLUDE_SUMMARY, 0)); cl_assert_equal_s(stat, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } diff --git a/tests/diff/submodules.c b/tests/diff/submodules.c index eebfef3a2..8899d3f9c 100644 --- a/tests/diff/submodules.c +++ b/tests/diff/submodules.c @@ -50,7 +50,7 @@ static void check_diff_patches_at_line( clar__assert_equal( file, line, "expected diff did not match actual diff", 1, "%s", expected[d], get_buf_ptr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); } cl_assert_at_line(expected[d] && !strcmp(expected[d], "<END>"), file, line); diff --git a/tests/diff/workdir.c b/tests/diff/workdir.c index e1bbce8fb..d8270621f 100644 --- a/tests/diff/workdir.c +++ b/tests/diff/workdir.c @@ -1677,7 +1677,7 @@ void test_diff_workdir__patience_diff(void) cl_assert_equal_s(expected_patience, buf.ptr); git_buf_clear(&buf); - git_buf_free(&buf); + git_buf_dispose(&buf); git_patch_free(patch); git_diff_free(diff); } @@ -1807,7 +1807,7 @@ void test_diff_workdir__can_update_index(void) git_buf path = GIT_BUF_INIT; cl_git_pass(git_buf_sets(&path, "status")); cl_git_pass(git_path_direach(&path, 0, touch_file, NULL)); - git_buf_free(&path); + git_buf_dispose(&path); } opts.flags |= GIT_DIFF_INCLUDE_IGNORED | GIT_DIFF_INCLUDE_UNTRACKED; @@ -1959,7 +1959,7 @@ void test_diff_workdir__binary_detection(void) git_diff_free(diff); git_index_free(idx); - git_buf_free(&b); + git_buf_dispose(&b); } void test_diff_workdir__to_index_conflicted(void) { @@ -2050,7 +2050,7 @@ void test_diff_workdir__only_writes_index_when_necessary(void) git_oid_cpy(&second, git_index_checksum(index)); cl_assert(!git_oid_equal(&first, &second)); - git_buf_free(&path); + git_buf_dispose(&path); git_object_free(head_object); git_reference_free(head); git_index_free(index); diff --git a/tests/fetchhead/nonetwork.c b/tests/fetchhead/nonetwork.c index a6394600a..6ea48a5f3 100644 --- a/tests/fetchhead/nonetwork.c +++ b/tests/fetchhead/nonetwork.c @@ -94,7 +94,7 @@ void test_fetchhead_nonetwork__write(void) equals = (strcmp(fetchhead_buf.ptr, FETCH_HEAD_WILDCARD_DATA_LOCAL) == 0); - git_buf_free(&fetchhead_buf); + git_buf_dispose(&fetchhead_buf); git_vector_foreach(&fetchhead_vector, i, fetchhead_ref) { git_fetchhead_ref_free(fetchhead_ref); @@ -427,7 +427,7 @@ void test_fetchhead_nonetwork__create_when_refpecs_given(void) cl_assert(found_haacked); git_remote_free(remote); - git_buf_free(&path); + git_buf_dispose(&path); } static bool count_refs_called; @@ -491,5 +491,5 @@ void test_fetchhead_nonetwork__create_with_multiple_refspecs(void) } git_remote_free(remote); - git_buf_free(&path); + git_buf_dispose(&path); } diff --git a/tests/filter/blob.c b/tests/filter/blob.c index bb2528d39..6e30e20a3 100644 --- a/tests/filter/blob.c +++ b/tests/filter/blob.c @@ -44,7 +44,7 @@ void test_filter_blob__all_crlf(void) /* we never convert CRLF -> LF on platforms that have LF */ cl_assert_equal_s(ALL_CRLF_TEXT_AS_CRLF, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_blob_free(blob); } @@ -63,19 +63,19 @@ void test_filter_blob__sanitizes(void) cl_git_pass(git_blob_filtered_content(&buf, blob, "file.bin", 1)); cl_assert_equal_sz(0, buf.size); cl_assert_equal_s("", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); memset(&buf, 0, sizeof(git_buf)); cl_git_pass(git_blob_filtered_content(&buf, blob, "file.crlf", 1)); cl_assert_equal_sz(0, buf.size); cl_assert_equal_s("", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); memset(&buf, 0, sizeof(git_buf)); cl_git_pass(git_blob_filtered_content(&buf, blob, "file.lf", 1)); cl_assert_equal_sz(0, buf.size); cl_assert_equal_s("", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_blob_free(blob); } @@ -111,7 +111,7 @@ void test_filter_blob__ident(void) cl_assert_equal_s( "Some text\n$Id: 3164f585d548ac68027d22b104f2d8100b2b6845 $\nGoes there\n", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_blob_free(blob); } diff --git a/tests/filter/crlf.c b/tests/filter/crlf.c index a8ebd949f..f67cb6248 100644 --- a/tests/filter/crlf.c +++ b/tests/filter/crlf.c @@ -41,7 +41,7 @@ void test_filter_crlf__to_worktree(void) cl_assert_equal_s("Some text\r\nRight here\r\n", out.ptr); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_crlf__to_odb(void) @@ -66,7 +66,7 @@ void test_filter_crlf__to_odb(void) cl_assert_equal_s("Some text\nRight here\n", out.ptr); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_crlf__with_safecrlf(void) @@ -107,7 +107,7 @@ void test_filter_crlf__with_safecrlf(void) cl_assert_equal_s(in.ptr, out.ptr); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_crlf__with_safecrlf_and_unsafe_allowed(void) @@ -150,7 +150,7 @@ void test_filter_crlf__with_safecrlf_and_unsafe_allowed(void) cl_assert_equal_s("Normal\nLF\nonly\nline-endings.\n", out.ptr); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_crlf__no_safecrlf(void) @@ -189,7 +189,7 @@ void test_filter_crlf__no_safecrlf(void) cl_assert_equal_s("Normal\nLF\nonly\nline-endings.\n", out.ptr); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_crlf__safecrlf_warn(void) @@ -231,5 +231,5 @@ void test_filter_crlf__safecrlf_warn(void) cl_assert_equal_s(in.ptr, out.ptr); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } diff --git a/tests/filter/custom.c b/tests/filter/custom.c index 799beef62..b9e4f7345 100644 --- a/tests/filter/custom.c +++ b/tests/filter/custom.c @@ -109,7 +109,7 @@ void test_filter_custom__to_odb(void) 0, memcmp(bitflipped_and_reversed_data, out.ptr, out.size)); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_custom__to_workdir(void) @@ -130,7 +130,7 @@ void test_filter_custom__to_workdir(void) 0, memcmp(workdir_data, out.ptr, out.size)); git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_custom__can_register_a_custom_filter_in_the_repository(void) @@ -228,7 +228,7 @@ void test_filter_custom__order_dependency(void) git_blob_id(blob), "8ca0df630d728c0c72072b6101b301391ef10095")); git_blob_free(blob); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_filter_custom__filter_registry_failure_cases(void) @@ -254,5 +254,5 @@ void test_filter_custom__erroneous_filter_fails(void) cl_git_fail(git_filter_list_apply_to_data(&out, filters, &in)); git_filter_list_free(filters); - git_buf_free(&out); + git_buf_dispose(&out); } diff --git a/tests/filter/file.c b/tests/filter/file.c index 599f4e54b..8f8a58527 100644 --- a/tests/filter/file.c +++ b/tests/filter/file.c @@ -47,7 +47,7 @@ void test_filter_file__apply(void) cl_git_pass(git_filter_list_apply_to_file(&buf, fl, g_repo, "all-crlf")); cl_assert_equal_s("crlf\ncrlf\ncrlf\ncrlf\n", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_filter_list_free(fl); } @@ -71,7 +71,7 @@ int buf_writestream_close(git_writestream *s) void buf_writestream_free(git_writestream *s) { struct buf_writestream *stream = (struct buf_writestream *)s; - git_buf_free(&stream->buf); + git_buf_dispose(&stream->buf); } void test_filter_file__apply_stream(void) diff --git a/tests/filter/ident.c b/tests/filter/ident.c index c54b6214c..cee0cc26b 100644 --- a/tests/filter/ident.c +++ b/tests/filter/ident.c @@ -31,7 +31,7 @@ static void add_blob_and_filter( cl_assert_equal_s(expected, out.ptr); git_blob_free(blob); - git_buf_free(&out); + git_buf_dispose(&out); } void test_filter_ident__to_worktree(void) diff --git a/tests/filter/stream.c b/tests/filter/stream.c index 30f5e5027..226092c3f 100644 --- a/tests/filter/stream.c +++ b/tests/filter/stream.c @@ -157,7 +157,7 @@ static void writefile(const char *filename, size_t numchunks) } p_close(fd); - git_buf_free(&path); + git_buf_dispose(&path); } static void test_stream(size_t numchunks) diff --git a/tests/filter/wildcard.c b/tests/filter/wildcard.c index 999b33653..ffa953121 100644 --- a/tests/filter/wildcard.c +++ b/tests/filter/wildcard.c @@ -137,8 +137,8 @@ void test_filter_wildcard__reverse(void) 0, memcmp(reversed, out.ptr, out.size)); git_filter_list_free(fl); - git_buf_free(&out); - git_buf_free(&in); + git_buf_dispose(&out); + git_buf_dispose(&in); } void test_filter_wildcard__flip(void) @@ -158,8 +158,8 @@ void test_filter_wildcard__flip(void) 0, memcmp(flipped, out.ptr, out.size)); git_filter_list_free(fl); - git_buf_free(&out); - git_buf_free(&in); + git_buf_dispose(&out); + git_buf_dispose(&in); } void test_filter_wildcard__none(void) @@ -179,6 +179,6 @@ void test_filter_wildcard__none(void) 0, memcmp(input, out.ptr, out.size)); git_filter_list_free(fl); - git_buf_free(&out); - git_buf_free(&in); + git_buf_dispose(&out); + git_buf_dispose(&in); } diff --git a/tests/index/filemodes.c b/tests/index/filemodes.c index 2693b1312..4eadb2c34 100644 --- a/tests/index/filemodes.c +++ b/tests/index/filemodes.c @@ -47,8 +47,8 @@ static void replace_file_with_mode( path.ptr, content.ptr, content.size, O_WRONLY|O_CREAT|O_TRUNC, create_mode); - git_buf_free(&path); - git_buf_free(&content); + git_buf_dispose(&path); + git_buf_dispose(&content); } #define add_and_check_mode(I,F,X) add_and_check_mode_(I,F,X,__FILE__,__LINE__) diff --git a/tests/index/nsec.c b/tests/index/nsec.c index ea8a26743..a20e3ead8 100644 --- a/tests/index/nsec.c +++ b/tests/index/nsec.c @@ -56,7 +56,7 @@ static bool should_expect_nsecs(void) p_unlink(nsec_path.ptr); - git_buf_free(&nsec_path); + git_buf_dispose(&nsec_path); return expect; } diff --git a/tests/index/racy.c b/tests/index/racy.c index 1768f5efd..a15f0fc87 100644 --- a/tests/index/racy.c +++ b/tests/index/racy.c @@ -46,7 +46,7 @@ void test_index_racy__diff(void) git_index_free(index); git_diff_free(diff); - git_buf_free(&path); + git_buf_dispose(&path); } void test_index_racy__write_index_just_after_file(void) @@ -95,7 +95,7 @@ void test_index_racy__write_index_just_after_file(void) cl_git_pass(git_diff_index_to_workdir(&diff, g_repo, index, NULL)); cl_assert_equal_i(1, git_diff_num_deltas(diff)); - git_buf_free(&path); + git_buf_dispose(&path); git_diff_free(diff); git_index_free(index); } @@ -129,7 +129,7 @@ static void setup_race(void) entry->mtime.seconds = st.st_mtime; entry->mtime.nanoseconds = st.st_mtime_nsec; - git_buf_free(&path); + git_buf_dispose(&path); } void test_index_racy__smudges_index_entry_on_save(void) @@ -196,7 +196,7 @@ static void setup_uptodate_files(void) cl_git_pass(git_index_add_frombuffer(index, &new_entry, "hello!\n", 7)); git_index_free(index); - git_buf_free(&path); + git_buf_dispose(&path); } void test_index_racy__adding_to_index_is_uptodate(void) diff --git a/tests/index/tests.c b/tests/index/tests.c index ea8335b48..b993fb263 100644 --- a/tests/index/tests.c +++ b/tests/index/tests.c @@ -40,7 +40,7 @@ static void copy_file(const char *src, const char *dst) cl_git_pass(p_write(dst_fd, source_buf.ptr, source_buf.size)); cleanup: - git_buf_free(&source_buf); + git_buf_dispose(&source_buf); p_close(dst_fd); } @@ -54,14 +54,14 @@ static void files_are_equal(const char *a, const char *b) cl_assert(0); if (git_futils_readbuffer(&buf_b, b) < 0) { - git_buf_free(&buf_a); + git_buf_dispose(&buf_a); cl_assert(0); } pass = (buf_a.size == buf_b.size && !memcmp(buf_a.ptr, buf_b.ptr, buf_a.size)); - git_buf_free(&buf_a); - git_buf_free(&buf_b); + git_buf_dispose(&buf_a); + git_buf_dispose(&buf_b); cl_assert(pass); } @@ -468,7 +468,7 @@ static void add_invalid_filename(git_repository *repo, const char *fn) cl_assert(git_index_entrycount(index) == 0); - git_buf_free(&path); + git_buf_dispose(&path); git_index_free(index); } @@ -545,7 +545,7 @@ static void write_invalid_filename(git_repository *repo, const char *fn_orig) p_unlink(path.ptr); cl_git_pass(git_index_remove_all(index, NULL, NULL, NULL)); - git_buf_free(&path); + git_buf_dispose(&path); git_index_free(index); git__free(fn); } diff --git a/tests/iterator/index.c b/tests/iterator/index.c index b609d5990..7de0d12c4 100644 --- a/tests/iterator/index.c +++ b/tests/iterator/index.c @@ -284,7 +284,7 @@ void test_iterator_index__case_folding(void) cl_git_pass(git_buf_joinpath(&path, cl_fixture("icase"), ".gitted/CoNfIg")); fs_is_ci = git_path_exists(path.ptr); - git_buf_free(&path); + git_buf_dispose(&path); index_iterator_test( "icase", NULL, NULL, 0, ARRAY_SIZE(expected_index_cs), @@ -1007,7 +1007,7 @@ static void create_paths(git_index *index, const char *root, int depth) } } - git_buf_free(&fullpath); + git_buf_dispose(&fullpath); } void test_iterator_index__pathlist_for_deeply_nested_item(void) diff --git a/tests/iterator/tree.c b/tests/iterator/tree.c index 07da58371..08df909a3 100644 --- a/tests/iterator/tree.c +++ b/tests/iterator/tree.c @@ -653,7 +653,7 @@ static void build_test_tree( cl_git_pass(git_treebuilder_write(out, builder)); git_treebuilder_free(builder); - git_buf_free(&name); + git_buf_dispose(&name); } void test_iterator_tree__case_conflicts_0(void) diff --git a/tests/iterator/workdir.c b/tests/iterator/workdir.c index c38a6152b..a16acd722 100644 --- a/tests/iterator/workdir.c +++ b/tests/iterator/workdir.c @@ -665,7 +665,7 @@ void test_iterator_workdir__filesystem_gunk(void) */ expect_iterator_items(i, 15, NULL, 15, NULL); git_iterator_free(i); - git_buf_free(&parent); + git_buf_dispose(&parent); } void test_iterator_workdir__skips_unreadable_dirs(void) @@ -1041,7 +1041,7 @@ static void create_paths(const char *root, int depth) } } - git_buf_free(&fullpath); + git_buf_dispose(&fullpath); } void test_iterator_workdir__pathlist_for_deeply_nested_item(void) diff --git a/tests/merge/driver.c b/tests/merge/driver.c index c75a00742..a3fececb4 100644 --- a/tests/merge/driver.c +++ b/tests/merge/driver.c @@ -129,7 +129,7 @@ static void set_gitattributes_to(const char *driver) cl_assert(!git_buf_oom(&line)); cl_git_mkfile(TEST_REPO_PATH "/.gitattributes", line.ptr); - git_buf_free(&line); + git_buf_dispose(&line); } static void merge_branch(void) diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c index 4b1b7d262..1b68bdccb 100644 --- a/tests/merge/merge_helpers.c +++ b/tests/merge/merge_helpers.c @@ -43,7 +43,7 @@ int merge_trees_from_branches( error = git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, opts); - git_buf_free(&branch_buf); + git_buf_dispose(&branch_buf); git_tree_free(our_tree); git_tree_free(their_tree); git_tree_free(ancestor_tree); @@ -75,7 +75,7 @@ int merge_commits_from_branches( error = git_merge_commits(index, repo, our_commit, their_commit, opts); - git_buf_free(&branch_buf); + git_buf_dispose(&branch_buf); git_commit_free(our_commit); git_commit_free(their_commit); @@ -359,7 +359,7 @@ int merge_test_workdir(git_repository *repo, const struct merge_index_entry expe return 0; } - git_buf_free(&wd); + git_buf_dispose(&wd); return 1; } diff --git a/tests/merge/trees/trivial.c b/tests/merge/trees/trivial.c index 2262edda6..c7f8d2423 100644 --- a/tests/merge/trees/trivial.c +++ b/tests/merge/trees/trivial.c @@ -51,7 +51,7 @@ static int merge_trivial(git_index **index, const char *ours, const char *theirs cl_git_pass(git_merge_trees(index, repo, ancestor_tree, our_tree, their_tree, &opts)); - git_buf_free(&branch_buf); + git_buf_dispose(&branch_buf); git_tree_free(our_tree); git_tree_free(their_tree); git_tree_free(ancestor_tree); diff --git a/tests/merge/workdir/analysis.c b/tests/merge/workdir/analysis.c index 351cfbdd5..84885c4fa 100644 --- a/tests/merge/workdir/analysis.c +++ b/tests/merge/workdir/analysis.c @@ -53,7 +53,7 @@ static void analysis_from_branch( cl_git_pass(git_merge_analysis(merge_analysis, merge_pref, repo, (const git_annotated_commit **)&their_head, 1)); - git_buf_free(&refname); + git_buf_dispose(&refname); git_annotated_commit_free(their_head); git_reference_free(their_ref); } @@ -108,7 +108,7 @@ void test_merge_workdir_analysis__unborn(void) cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD, (merge_analysis & GIT_MERGE_ANALYSIS_FASTFORWARD)); cl_assert_equal_i(GIT_MERGE_ANALYSIS_UNBORN, (merge_analysis & GIT_MERGE_ANALYSIS_UNBORN)); - git_buf_free(&master); + git_buf_dispose(&master); } void test_merge_workdir_analysis__fastforward_with_config_noff(void) diff --git a/tests/merge/workdir/dirty.c b/tests/merge/workdir/dirty.c index a69919f53..66301e156 100644 --- a/tests/merge/workdir/dirty.c +++ b/tests/merge/workdir/dirty.c @@ -123,8 +123,8 @@ static void write_files(char *files[]) cl_git_mkfile(path.ptr, content.ptr); } - git_buf_free(&path); - git_buf_free(&content); + git_buf_dispose(&path); + git_buf_dispose(&content); } static void hack_index(char *files[]) @@ -178,7 +178,7 @@ static void hack_index(char *files[]) entry->file_size = (uint32_t)statbuf.st_size; } - git_buf_free(&path); + git_buf_dispose(&path); } static void stage_random_files(char *files[]) @@ -218,7 +218,7 @@ static void stage_content(char *content[]) git_object_free(head_object); git_reference_free(head); - git_buf_free(&path); + git_buf_dispose(&path); } static int merge_dirty_files(char *dirty_files[]) diff --git a/tests/merge/workdir/recursive.c b/tests/merge/workdir/recursive.c index d47a0c50b..e7dc267e4 100644 --- a/tests/merge/workdir/recursive.c +++ b/tests/merge/workdir/recursive.c @@ -46,7 +46,7 @@ void test_merge_workdir_recursive__writes_conflict_with_virtual_base(void) cl_assert_equal_s(CONFLICTING_RECURSIVE_F1_TO_F2, conflicting_buf.ptr); git_index_free(index); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); } void test_merge_workdir_recursive__conflicting_merge_base_with_diff3(void) @@ -80,5 +80,5 @@ void test_merge_workdir_recursive__conflicting_merge_base_with_diff3(void) cl_assert_equal_s(CONFLICTING_RECURSIVE_H2_TO_H1_WITH_DIFF3, conflicting_buf.ptr); git_index_free(index); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); } diff --git a/tests/merge/workdir/setup.c b/tests/merge/workdir/setup.c index 4aebf8701..92524e2ed 100644 --- a/tests/merge/workdir/setup.c +++ b/tests/merge/workdir/setup.c @@ -54,8 +54,8 @@ static bool test_file_contents(const char *filename, const char *expected) cl_git_pass(git_futils_readbuffer(&file_buf, file_path_buf.ptr)); equals = (strcmp(file_buf.ptr, expected) == 0); - git_buf_free(&file_path_buf); - git_buf_free(&file_buf); + git_buf_dispose(&file_path_buf); + git_buf_dispose(&file_buf); return equals; } @@ -68,7 +68,7 @@ static void write_file_contents(const char *filename, const char *output) filename); cl_git_rewritefile(file_path_buf.ptr, output); - git_buf_free(&file_path_buf); + git_buf_dispose(&file_path_buf); } /* git merge --no-ff octo1 */ @@ -495,10 +495,10 @@ static int create_remote_tracking_branch(const char *branch_name, const char *oi cl_git_rewritefile(git_buf_cstr(&filename), git_buf_cstr(&data)); done: - git_buf_free(&remotes_path); - git_buf_free(&origin_path); - git_buf_free(&filename); - git_buf_free(&data); + git_buf_dispose(&remotes_path); + git_buf_dispose(&origin_path); + git_buf_dispose(&filename); + git_buf_dispose(&data); return error; } diff --git a/tests/merge/workdir/simple.c b/tests/merge/workdir/simple.c index 964532e46..32b20623f 100644 --- a/tests/merge/workdir/simple.c +++ b/tests/merge/workdir/simple.c @@ -155,7 +155,7 @@ void test_merge_workdir_simple__automerge(void) cl_git_pass(git_futils_readbuffer(&automergeable_buf, TEST_REPO_PATH "/automergeable.txt")); cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE) == 0); - git_buf_free(&automergeable_buf); + git_buf_dispose(&automergeable_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); @@ -201,7 +201,7 @@ void test_merge_workdir_simple__automerge_crlf(void) cl_git_pass(git_futils_readbuffer(&automergeable_buf, TEST_REPO_PATH "/automergeable.txt")); cl_assert(strcmp(automergeable_buf.ptr, AUTOMERGEABLE_MERGED_FILE_CRLF) == 0); - git_buf_free(&automergeable_buf); + git_buf_dispose(&automergeable_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); @@ -252,8 +252,8 @@ void test_merge_workdir_simple__mergefile(void) "\n" \ "Conflicts:\n" \ "\tconflicting.txt\n") == 0); - git_buf_free(&conflicting_buf); - git_buf_free(&mergemsg_buf); + git_buf_dispose(&conflicting_buf); + git_buf_dispose(&mergemsg_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); @@ -289,7 +289,7 @@ void test_merge_workdir_simple__diff3(void) cl_git_pass(git_futils_readbuffer(&conflicting_buf, TEST_REPO_PATH "/conflicting.txt")); cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); @@ -324,7 +324,7 @@ void test_merge_workdir_simple__union(void) cl_git_pass(git_futils_readbuffer(&conflicting_buf, TEST_REPO_PATH "/conflicting.txt")); cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 6)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4)); @@ -360,7 +360,7 @@ void test_merge_workdir_simple__gitattributes_union(void) cl_git_pass(git_futils_readbuffer(&conflicting_buf, TEST_REPO_PATH "/conflicting.txt")); cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_UNION_FILE) == 0); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 6)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 4)); @@ -400,7 +400,7 @@ void test_merge_workdir_simple__diff3_from_config(void) cl_git_pass(git_futils_readbuffer(&conflicting_buf, TEST_REPO_PATH "/conflicting.txt")); cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_DIFF3_FILE) == 0); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); @@ -442,7 +442,7 @@ void test_merge_workdir_simple__merge_overrides_config(void) cl_git_pass(git_futils_readbuffer(&conflicting_buf, TEST_REPO_PATH "/conflicting.txt")); cl_assert(strcmp(conflicting_buf.ptr, CONFLICTING_MERGE_FILE) == 0); - git_buf_free(&conflicting_buf); + git_buf_dispose(&conflicting_buf); cl_assert(merge_test_index(repo_index, merge_index_entries, 8)); cl_assert(merge_test_reuc(repo_index, merge_reuc_entries, 3)); diff --git a/tests/merge/workdir/trivial.c b/tests/merge/workdir/trivial.c index 4ddaf233d..85cce493a 100644 --- a/tests/merge/workdir/trivial.c +++ b/tests/merge/workdir/trivial.c @@ -49,7 +49,7 @@ static int merge_trivial(const char *ours, const char *theirs) cl_git_pass(git_merge(repo, (const git_annotated_commit **)their_heads, 1, NULL, NULL)); - git_buf_free(&branch_buf); + git_buf_dispose(&branch_buf); git_reference_free(our_ref); git_reference_free(their_ref); git_annotated_commit_free(their_heads[0]); diff --git a/tests/network/refspecs.c b/tests/network/refspecs.c index c47f197ff..051802b38 100644 --- a/tests/network/refspecs.c +++ b/tests/network/refspecs.c @@ -97,7 +97,7 @@ static void assert_valid_transform(const char *refspec, const char *name, const cl_git_pass(git_refspec_transform(&buf, &spec, name)); cl_assert_equal_s(result, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); git_refspec__free(&spec); } @@ -119,7 +119,7 @@ static void assert_invalid_transform(const char *refspec, const char *name) git_refspec__parse(&spec, refspec, true); cl_git_fail(git_refspec_transform(&buf, &spec, name)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_refspec__free(&spec); } @@ -137,7 +137,7 @@ static void assert_invalid_rtransform(const char *refspec, const char *name) git_refspec__parse(&spec, refspec, true); cl_git_fail(git_refspec_rtransform(&buf, &spec, name)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_refspec__free(&spec); } diff --git a/tests/network/remote/defaultbranch.c b/tests/network/remote/defaultbranch.c index 9ab0d4095..b0417f764 100644 --- a/tests/network/remote/defaultbranch.c +++ b/tests/network/remote/defaultbranch.c @@ -29,7 +29,7 @@ static void assert_default_branch(const char *should) cl_git_pass(git_remote_connect(g_remote, GIT_DIRECTION_FETCH, NULL, NULL, NULL)); cl_git_pass(git_remote_default_branch(&name, g_remote)); cl_assert_equal_s(should, name.ptr); - git_buf_free(&name); + git_buf_dispose(&name); } void test_network_remote_defaultbranch__master(void) diff --git a/tests/network/remote/local.c b/tests/network/remote/local.c index 76872e51f..99b91c5d0 100644 --- a/tests/network/remote/local.c +++ b/tests/network/remote/local.c @@ -25,7 +25,7 @@ void test_network_remote_local__initialize(void) void test_network_remote_local__cleanup(void) { - git_buf_free(&file_path_buf); + git_buf_dispose(&file_path_buf); git_remote_free(remote); remote = NULL; diff --git a/tests/network/remote/remotes.c b/tests/network/remote/remotes.c index 9c7e6b299..8bbc5c7c9 100644 --- a/tests/network/remote/remotes.c +++ b/tests/network/remote/remotes.c @@ -189,7 +189,7 @@ void test_network_remote_remotes__transform(void) cl_git_pass(git_refspec_transform(&ref, _refspec, "refs/heads/master")); cl_assert_equal_s(ref.ptr, "refs/remotes/test/master"); - git_buf_free(&ref); + git_buf_dispose(&ref); } void test_network_remote_remotes__transform_destination_to_source(void) @@ -198,7 +198,7 @@ void test_network_remote_remotes__transform_destination_to_source(void) cl_git_pass(git_refspec_rtransform(&ref, _refspec, "refs/remotes/test/master")); cl_assert_equal_s(ref.ptr, "refs/heads/master"); - git_buf_free(&ref); + git_buf_dispose(&ref); } void test_network_remote_remotes__missing_refspecs(void) diff --git a/tests/notes/notes.c b/tests/notes/notes.c index 9626f53b3..f2457665c 100644 --- a/tests/notes/notes.c +++ b/tests/notes/notes.c @@ -287,7 +287,7 @@ void test_notes_notes__inserting_a_note_without_passing_a_namespace_uses_the_def assert_note_equal(note, "hello world\n", ¬e_oid); assert_note_equal(default_namespace_note, "hello world\n", ¬e_oid); - git_buf_free(&default_ref); + git_buf_dispose(&default_ref); git_note_free(note); git_note_free(default_namespace_note); } diff --git a/tests/notes/notesref.c b/tests/notes/notesref.c index 4159ddc0d..3bcb05f20 100644 --- a/tests/notes/notesref.c +++ b/tests/notes/notesref.c @@ -64,5 +64,5 @@ void test_notes_notesref__config_corenotesref(void) cl_git_pass(git_note_default_ref(&default_ref, _repo)); cl_assert_equal_s(GIT_NOTES_DEFAULT_REF, default_ref.ptr); - git_buf_free(&default_ref); + git_buf_dispose(&default_ref); } diff --git a/tests/object/blob/filter.c b/tests/object/blob/filter.c index 0aaaee6f3..002177cee 100644 --- a/tests/object/blob/filter.c +++ b/tests/object/blob/filter.c @@ -103,7 +103,7 @@ void test_object_blob_filter__stats(void) git_blob_free(blob); } - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_object_blob_filter__to_odb(void) @@ -139,12 +139,12 @@ void test_object_blob_filter__to_odb(void) cl_assert_equal_sz(g_crlf_filtered[i].size, zeroed.size); cl_assert_equal_i( 0, memcmp(zeroed.ptr, g_crlf_filtered[i].ptr, zeroed.size)); - git_buf_free(&zeroed); + git_buf_dispose(&zeroed); git_blob_free(blob); } git_filter_list_free(fl); - git_buf_free(&out); + git_buf_dispose(&out); git_config_free(cfg); } diff --git a/tests/object/blob/fromstream.c b/tests/object/blob/fromstream.c index d23149bd1..34b9f58d1 100644 --- a/tests/object/blob/fromstream.c +++ b/tests/object/blob/fromstream.c @@ -56,7 +56,7 @@ static void write_attributes(git_repository *repo) cl_git_pass(git_futils_mkpath2file(git_buf_cstr(&buf), 0777)); cl_git_rewritefile(git_buf_cstr(&buf), GITATTR); - git_buf_free(&buf); + git_buf_dispose(&buf); } static void assert_named_chunked_blob(const char *expected_sha, const char *fake_name) diff --git a/tests/object/blob/write.c b/tests/object/blob/write.c index 203bc67c1..4cf5a6607 100644 --- a/tests/object/blob/write.c +++ b/tests/object/blob/write.c @@ -48,7 +48,7 @@ void test_object_blob_write__can_create_a_blob_in_a_standard_repo_from_a_absolut assert_blob_creation(ELSEWHERE "/test.txt", git_buf_cstr(&full_path), &git_blob_create_fromdisk); - git_buf_free(&full_path); + git_buf_dispose(&full_path); cl_must_pass(git_futils_rmdir_r(ELSEWHERE, NULL, GIT_RMDIR_REMOVE_FILES)); } @@ -64,6 +64,6 @@ void test_object_blob_write__can_create_a_blob_in_a_bare_repo_from_a_absolute_fi assert_blob_creation(ELSEWHERE "/test.txt", git_buf_cstr(&full_path), &git_blob_create_fromdisk); - git_buf_free(&full_path); + git_buf_dispose(&full_path); cl_must_pass(git_futils_rmdir_r(ELSEWHERE, NULL, GIT_RMDIR_REMOVE_FILES)); } diff --git a/tests/object/commit/commitstagedfile.c b/tests/object/commit/commitstagedfile.c index 5b48519b8..63ecfeebe 100644 --- a/tests/object/commit/commitstagedfile.c +++ b/tests/object/commit/commitstagedfile.c @@ -127,7 +127,7 @@ void test_object_commit_commitstagedfile__generate_predictable_object_ids(void) cl_assert(git_oid_cmp(&expected_commit_oid, &commit_oid) == 0); - git_buf_free(&buffer); + git_buf_dispose(&buffer); git_signature_free(signature); git_tree_free(tree); git_index_free(index); diff --git a/tests/object/lookup.c b/tests/object/lookup.c index 544f32bc4..536c415e7 100644 --- a/tests/object/lookup.c +++ b/tests/object/lookup.c @@ -88,8 +88,8 @@ void test_object_lookup__lookup_corrupt_object_returns_error(void) cl_git_pass(git_object_lookup(&object, g_repo, &oid, GIT_OBJ_COMMIT)); git_object_free(object); - git_buf_free(&path); - git_buf_free(&contents); + git_buf_dispose(&path); + git_buf_dispose(&contents); } void test_object_lookup__lookup_object_with_wrong_hash_returns_error(void) @@ -117,6 +117,6 @@ void test_object_lookup__lookup_object_with_wrong_hash_returns_error(void) cl_git_pass(git_libgit2_opts(GIT_OPT_ENABLE_STRICT_HASH_VERIFICATION, 1)); git_object_free(object); - git_buf_free(&oldpath); - git_buf_free(&newpath); + git_buf_dispose(&oldpath); + git_buf_dispose(&newpath); } diff --git a/tests/object/message.c b/tests/object/message.c index 40d8e7297..519ce5f31 100644 --- a/tests/object/message.c +++ b/tests/object/message.c @@ -9,7 +9,7 @@ static void assert_message_prettifying(char *expected_output, char *input, int s git_message_prettify(&prettified_message, input, strip_comments, '#'); cl_assert_equal_s(expected_output, git_buf_cstr(&prettified_message)); - git_buf_free(&prettified_message); + git_buf_dispose(&prettified_message); } #define t40 "A quick brown fox jumps over the lazy do" @@ -177,23 +177,23 @@ void test_object_message__message_prettify(void) memset(&buffer, 0, sizeof(buffer)); cl_git_pass(git_message_prettify(&buffer, "", 0, '#')); cl_assert_equal_s(buffer.ptr, ""); - git_buf_free(&buffer); + git_buf_dispose(&buffer); cl_git_pass(git_message_prettify(&buffer, "", 1, '#')); cl_assert_equal_s(buffer.ptr, ""); - git_buf_free(&buffer); + git_buf_dispose(&buffer); cl_git_pass(git_message_prettify(&buffer, "Short", 0, '#')); cl_assert_equal_s("Short\n", buffer.ptr); - git_buf_free(&buffer); + git_buf_dispose(&buffer); cl_git_pass(git_message_prettify(&buffer, "Short", 1, '#')); cl_assert_equal_s("Short\n", buffer.ptr); - git_buf_free(&buffer); + git_buf_dispose(&buffer); cl_git_pass(git_message_prettify(&buffer, "This is longer\nAnd multiline\n# with some comments still in\n", 0, '#')); cl_assert_equal_s(buffer.ptr, "This is longer\nAnd multiline\n# with some comments still in\n"); - git_buf_free(&buffer); + git_buf_dispose(&buffer); cl_git_pass(git_message_prettify(&buffer, "This is longer\nAnd multiline\n# with some comments still in\n", 1, '#')); cl_assert_equal_s(buffer.ptr, "This is longer\nAnd multiline\n"); - git_buf_free(&buffer); + git_buf_dispose(&buffer); } diff --git a/tests/object/shortid.c b/tests/object/shortid.c index d854cb78e..5c5990a6b 100644 --- a/tests/object/shortid.c +++ b/tests/object/shortid.c @@ -47,5 +47,5 @@ void test_object_shortid__select(void) cl_assert_equal_s("dea509d0b", shorty.ptr); git_object_free(obj); - git_buf_free(&shorty); + git_buf_dispose(&shorty); } diff --git a/tests/object/tree/write.c b/tests/object/tree/write.c index a1ee03d6d..8df69388c 100644 --- a/tests/object/tree/write.c +++ b/tests/object/tree/write.c @@ -399,7 +399,7 @@ void test_object_tree_write__cruel_paths(void) cl_git_pass(git_tree_entry_bypath(&te, tree, b.ptr)); cl_assert_equal_s(the_paths[j], git_tree_entry_name(te)); git_tree_entry_free(te); - git_buf_free(&b); + git_buf_dispose(&b); } } diff --git a/tests/odb/alternates.c b/tests/odb/alternates.c index b5c0e79c0..f65a44bb5 100644 --- a/tests/odb/alternates.c +++ b/tests/odb/alternates.c @@ -13,8 +13,8 @@ void test_odb_alternates__cleanup(void) { size_t i; - git_buf_free(&destpath); - git_buf_free(&filepath); + git_buf_dispose(&destpath); + git_buf_dispose(&filepath); for (i = 0; i < ARRAY_SIZE(paths); i++) cl_fixture_cleanup(paths[i]); diff --git a/tests/odb/foreach.c b/tests/odb/foreach.c index 42d706467..5db66ba27 100644 --- a/tests/odb/foreach.c +++ b/tests/odb/foreach.c @@ -114,7 +114,7 @@ void test_odb_foreach__files_in_objects_dir(void) cl_git_pass(git_buf_printf(&buf, "%s/objects/somefile", git_repository_path(repo))); cl_git_mkfile(buf.ptr, ""); - git_buf_free(&buf); + git_buf_dispose(&buf); cl_git_pass(git_repository_odb(&odb, repo)); cl_git_pass(git_odb_foreach(odb, foreach_cb, &nobj)); diff --git a/tests/odb/freshen.c b/tests/odb/freshen.c index 9d3cf51dc..63541260e 100644 --- a/tests/odb/freshen.c +++ b/tests/odb/freshen.c @@ -31,7 +31,7 @@ static void set_time_wayback(struct stat *out, const char *fn) cl_must_pass(p_utimes(git_buf_cstr(&fullpath), old)); cl_must_pass(p_lstat(git_buf_cstr(&fullpath), out)); - git_buf_free(&fullpath); + git_buf_dispose(&fullpath); } #define LOOSE_STR "my new file\n" diff --git a/tests/odb/largefiles.c b/tests/odb/largefiles.c index a5b982e14..9fd99e520 100644 --- a/tests/odb/largefiles.c +++ b/tests/odb/largefiles.c @@ -36,7 +36,7 @@ static void writefile(git_oid *oid) cl_git_pass(git_odb_stream_finalize_write(oid, stream)); git_odb_stream_free(stream); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_odb_largefiles__write_from_memory(void) diff --git a/tests/online/clone.c b/tests/online/clone.c index 43106145c..de66238e3 100644 --- a/tests/online/clone.c +++ b/tests/online/clone.c @@ -170,7 +170,7 @@ void test_online_clone__can_checkout_a_cloned_repo(void) cl_assert_equal_i(true, fetch_progress_cb_was_called); git_reference_free(head); - git_buf_free(&path); + git_buf_dispose(&path); } static int remote_mirror_cb(git_remote **out, git_repository *repo, @@ -734,7 +734,7 @@ void test_online_clone__proxy_credentials_request(void) cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options)); cl_assert(called_proxy_creds); - git_buf_free(&url); + git_buf_dispose(&url); } void test_online_clone__proxy_credentials_in_url(void) @@ -752,7 +752,7 @@ void test_online_clone__proxy_credentials_in_url(void) cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options)); cl_assert(called_proxy_creds == 0); - git_buf_free(&url); + git_buf_dispose(&url); } void test_online_clone__proxy_credentials_in_environment(void) @@ -775,5 +775,5 @@ void test_online_clone__proxy_credentials_in_environment(void) cl_git_pass(git_clone(&g_repo, "http://github.com/libgit2/TestGitRepository", "./foo", &g_options)); - git_buf_free(&url); + git_buf_dispose(&url); } diff --git a/tests/online/fetchhead.c b/tests/online/fetchhead.c index c1ac06dbe..ae72dde57 100644 --- a/tests/online/fetchhead.c +++ b/tests/online/fetchhead.c @@ -72,7 +72,7 @@ static void fetchhead_test_fetch(const char *fetchspec, const char *expected_fet equals = (strcmp(fetchhead_buf.ptr, expected_fetchhead) == 0); - git_buf_free(&fetchhead_buf); + git_buf_dispose(&fetchhead_buf); cl_assert(equals); } diff --git a/tests/online/push.c b/tests/online/push.c index f72b4f8cb..000e48104 100644 --- a/tests/online/push.c +++ b/tests/online/push.c @@ -149,7 +149,7 @@ static void do_verify_push_status(record_callbacks_data *data, const push_status cl_fail(git_buf_cstr(&msg)); - git_buf_free(&msg); + git_buf_dispose(&msg); } git_vector_foreach(actual, i, iter) @@ -263,8 +263,8 @@ failed: git__free(actual_ref); git_vector_free(&actual_refs); - git_buf_free(&msg); - git_buf_free(&ref_name); + git_buf_dispose(&msg); + git_buf_dispose(&ref_name); } static void verify_update_tips_callback(git_remote *remote, expected_ref expected_refs[], size_t expected_refs_len) @@ -309,8 +309,8 @@ failed: if (failed) cl_fail(git_buf_cstr(&msg)); - git_buf_free(&ref_name); - git_buf_free(&msg); + git_buf_dispose(&ref_name); + git_buf_dispose(&msg); } void test_online_push__initialize(void) diff --git a/tests/online/push_util.c b/tests/online/push_util.c index eafec2f05..fe9af2c43 100644 --- a/tests/online/push_util.c +++ b/tests/online/push_util.c @@ -137,5 +137,5 @@ failed: cl_fail(git_buf_cstr(&msg)); - git_buf_free(&msg); + git_buf_dispose(&msg); } diff --git a/tests/pack/indexer.c b/tests/pack/indexer.c index f3c2204bd..453399809 100644 --- a/tests/pack/indexer.c +++ b/tests/pack/indexer.c @@ -249,7 +249,7 @@ void test_pack_indexer__no_tmp_files(void) /* Precondition: there are no temporary files. */ cl_git_pass(git_buf_sets(&path, clar_sandbox_path())); cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path)); - git_buf_free(&path); + git_buf_dispose(&path); cl_assert(git_buf_len(&first_tmp_file) == 0); cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL, NULL)); @@ -257,7 +257,7 @@ void test_pack_indexer__no_tmp_files(void) cl_git_pass(git_buf_sets(&path, clar_sandbox_path())); cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path)); - git_buf_free(&path); + git_buf_dispose(&path); cl_assert(git_buf_len(&first_tmp_file) == 0); - git_buf_free(&first_tmp_file); + git_buf_dispose(&first_tmp_file); } diff --git a/tests/pack/packbuilder.c b/tests/pack/packbuilder.c index 13ee07353..932cb3861 100644 --- a/tests/pack/packbuilder.c +++ b/tests/pack/packbuilder.c @@ -128,8 +128,8 @@ void test_pack_packbuilder__create_pack(void) cl_git_pass(git_hash_final(&hash, &ctx)); git_hash_ctx_cleanup(&ctx); - git_buf_free(&path); - git_buf_free(&buf); + git_buf_dispose(&path); + git_buf_dispose(&buf); git_oid_fmt(hex, &hash); diff --git a/tests/patch/print.c b/tests/patch/print.c index 62e50b93e..4703c1d51 100644 --- a/tests/patch/print.c +++ b/tests/patch/print.c @@ -20,7 +20,7 @@ void patch_print_from_patchfile(const char *data, size_t len) cl_assert_equal_s(data, buf.ptr); git_patch_free(patch); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_patch_print__change_middle(void) diff --git a/tests/path/core.c b/tests/path/core.c index 0ab41ea50..bbcded083 100644 --- a/tests/path/core.c +++ b/tests/path/core.c @@ -11,7 +11,7 @@ static void test_make_relative( git_buf_puts(&buf, path); cl_assert_equal_i(expected_status, git_path_make_relative(&buf, parent)); cl_assert_equal_s(expected_path, buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_path_core__make_relative(void) @@ -319,7 +319,7 @@ static void test_join_unrooted( cl_assert_equal_s(expected_result, result.ptr); cl_assert_equal_i(expected_rootlen, root_at); - git_buf_free(&result); + git_buf_dispose(&result); } void test_path_core__join_unrooted(void) @@ -350,5 +350,5 @@ void test_path_core__join_unrooted(void) /* Trailing slash in the base is ignored */ test_join_unrooted("c:/foo/bar/foobar", 6, "c:/foo/bar/foobar", "c:/foo/"); - git_buf_free(&out); + git_buf_dispose(&out); } diff --git a/tests/rebase/submodule.c b/tests/rebase/submodule.c index 8ae78ce5b..7e27d7c9d 100644 --- a/tests/rebase/submodule.c +++ b/tests/rebase/submodule.c @@ -81,7 +81,7 @@ void test_rebase_submodule__init_untracked(void) fp = fopen(git_buf_cstr(&untracked_path), "w"); fprintf(fp, "An untracked file in a submodule should not block a rebase\n"); fclose(fp); - git_buf_free(&untracked_path); + git_buf_dispose(&untracked_path); cl_git_pass(git_rebase_init(&rebase, repo, branch_head, upstream_head, NULL, NULL)); diff --git a/tests/refs/branches/create.c b/tests/refs/branches/create.c index a4db57446..70ffad88d 100644 --- a/tests/refs/branches/create.c +++ b/tests/refs/branches/create.c @@ -132,7 +132,7 @@ static void assert_branch_matches_name( git_oid_cmp(git_reference_target(ref), git_commit_id(target))); git_reference_free(ref); - git_buf_free(&b); + git_buf_dispose(&b); } void test_refs_branches_create__can_create_branch_with_unicode(void) diff --git a/tests/refs/branches/remote.c b/tests/refs/branches/remote.c index 47526717f..ac428abcb 100644 --- a/tests/refs/branches/remote.c +++ b/tests/refs/branches/remote.c @@ -26,7 +26,7 @@ void test_refs_branches_remote__can_get_remote_for_branch(void) cl_git_pass(git_branch_remote_name(&remotename, g_repo, remote_tracking_branch_name)); cl_assert_equal_s("test", remotename.ptr); - git_buf_free(&remotename); + git_buf_dispose(&remotename); } void test_refs_branches_remote__no_matching_remote_returns_error(void) diff --git a/tests/refs/branches/upstream.c b/tests/refs/branches/upstream.c index 82f5665d8..6024b1d7a 100644 --- a/tests/refs/branches/upstream.c +++ b/tests/refs/branches/upstream.c @@ -68,7 +68,7 @@ void test_refs_branches_upstream__upstream_remote(void) cl_git_pass(git_branch_upstream_remote(&buf, repo, "refs/heads/master")); cl_assert_equal_s("test", buf.ptr); - git_buf_free(&buf); + git_buf_dispose(&buf); } void test_refs_branches_upstream__upstream_remote_empty_value(void) diff --git a/tests/refs/branches/upstreamname.c b/tests/refs/branches/upstreamname.c index d30002e08..2eb639738 100644 --- a/tests/refs/branches/upstreamname.c +++ b/tests/refs/branches/upstreamname.c @@ -13,7 +13,7 @@ void test_refs_branches_upstreamname__initialize(void) void test_refs_branches_upstreamname__cleanup(void) { - git_buf_free(&upstream_name); + git_buf_dispose(&upstream_name); git_repository_free(repo); repo = NULL; diff --git a/tests/refs/delete.c b/tests/refs/delete.c index a1b9e251e..8cad31686 100644 --- a/tests/refs/delete.c +++ b/tests/refs/delete.c @@ -52,7 +52,7 @@ void test_refs_delete__packed_loose(void) cl_assert(!git_path_exists(temp_path.ptr)); git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); + git_buf_dispose(&temp_path); } void test_refs_delete__packed_only(void) diff --git a/tests/refs/pack.c b/tests/refs/pack.c index bda86f69a..92312e26d 100644 --- a/tests/refs/pack.c +++ b/tests/refs/pack.c @@ -37,7 +37,7 @@ void test_refs_pack__empty(void) cl_git_pass(git_buf_join_n(&temp_path, '/', 3, git_repository_path(g_repo), GIT_REFS_HEADS_DIR, "empty_dir")); cl_git_pass(git_futils_mkdir_r(temp_path.ptr, GIT_REFS_DIR_MODE)); - git_buf_free(&temp_path); + git_buf_dispose(&temp_path); packall(); } @@ -75,7 +75,7 @@ void test_refs_pack__loose(void) cl_assert(!git_path_exists(temp_path.ptr)); git_reference_free(reference); - git_buf_free(&temp_path); + git_buf_dispose(&temp_path); } void test_refs_pack__symbolic(void) diff --git a/tests/refs/read.c b/tests/refs/read.c index cb42a568b..c00b016ee 100644 --- a/tests/refs/read.c +++ b/tests/refs/read.c @@ -45,7 +45,7 @@ void test_refs_read__loose_tag(void) /* Ensure the name of the tag matches the name of the reference */ cl_git_pass(git_buf_joinpath(&ref_name_from_tag_name, GIT_REFS_TAGS_DIR, git_tag_name((git_tag *)object))); cl_assert_equal_s(ref_name_from_tag_name.ptr, loose_tag_ref_name); - git_buf_free(&ref_name_from_tag_name); + git_buf_dispose(&ref_name_from_tag_name); git_object_free(object); diff --git a/tests/refs/ref_helpers.c b/tests/refs/ref_helpers.c index 7676e65a7..42b49216c 100644 --- a/tests/refs/ref_helpers.c +++ b/tests/refs/ref_helpers.c @@ -19,7 +19,7 @@ int reference_is_packed(git_reference *ref) packed = !git_path_isfile(ref_path.ptr); - git_buf_free(&ref_path); + git_buf_dispose(&ref_path); return packed; } diff --git a/tests/refs/reflog/messages.c b/tests/refs/reflog/messages.c index a7a77666b..3868e774d 100644 --- a/tests/refs/reflog/messages.c +++ b/tests/refs/reflog/messages.c @@ -355,7 +355,7 @@ void test_refs_reflog_messages__creating_branches_default_messages(void) g_email, "branch: Created from e90810b8df3"); git_annotated_commit_free(annotated); - git_buf_free(&buf); + git_buf_dispose(&buf); git_commit_free(target); git_reference_free(branch1); git_reference_free(branch2); diff --git a/tests/refs/reflog/reflog.c b/tests/refs/reflog/reflog.c index bbcdbf91b..a4484631a 100644 --- a/tests/refs/reflog/reflog.c +++ b/tests/refs/reflog/reflog.c @@ -120,8 +120,8 @@ void test_refs_reflog_reflog__renaming_the_reference_moves_the_reflog(void) cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&moved_log_path))); git_reference_free(new_master); - git_buf_free(&moved_log_path); - git_buf_free(&master_log_path); + git_buf_dispose(&moved_log_path); + git_buf_dispose(&master_log_path); } void test_refs_reflog_reflog__deleting_the_reference_deletes_the_reflog(void) @@ -139,7 +139,7 @@ void test_refs_reflog_reflog__deleting_the_reference_deletes_the_reflog(void) git_reference_free(master); cl_assert_equal_i(false, git_path_isfile(git_buf_cstr(&master_log_path))); - git_buf_free(&master_log_path); + git_buf_dispose(&master_log_path); } void test_refs_reflog_reflog__removes_empty_reflog_dir(void) @@ -165,7 +165,7 @@ void test_refs_reflog_reflog__removes_empty_reflog_dir(void) cl_git_pass(git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL)); git_reference_free(ref); - git_buf_free(&log_path); + git_buf_dispose(&log_path); } void test_refs_reflog_reflog__fails_gracefully_on_nonempty_reflog_dir(void) @@ -192,7 +192,7 @@ void test_refs_reflog_reflog__fails_gracefully_on_nonempty_reflog_dir(void) cl_git_fail_with(GIT_EDIRECTORY, git_reference_create(&ref, g_repo, "refs/heads/new-dir", &id, 0, NULL)); git_reference_free(ref); - git_buf_free(&log_path); + git_buf_dispose(&log_path); } static void assert_has_reflog(bool expected_result, const char *name) @@ -221,7 +221,7 @@ void test_refs_reflog_reflog__reading_the_reflog_from_a_reference_with_no_log_re cl_assert_equal_i(0, (int)git_reflog_entrycount(reflog)); git_reflog_free(reflog); - git_buf_free(&subtrees_log_path); + git_buf_dispose(&subtrees_log_path); } void test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error(void) @@ -263,8 +263,8 @@ void test_refs_reflog_reflog__reading_a_reflog_with_invalid_format_returns_error cl_assert_equal_s("unable to parse OID - contains invalid characters", error->message); git_reference_free(ref); - git_buf_free(&logpath); - git_buf_free(&logcontents); + git_buf_dispose(&logpath); + git_buf_dispose(&logcontents); } void test_refs_reflog_reflog__cannot_write_a_moved_reflog(void) @@ -285,8 +285,8 @@ void test_refs_reflog_reflog__cannot_write_a_moved_reflog(void) git_reflog_free(reflog); git_reference_free(new_master); - git_buf_free(&moved_log_path); - git_buf_free(&master_log_path); + git_buf_dispose(&moved_log_path); + git_buf_dispose(&master_log_path); } void test_refs_reflog_reflog__renaming_with_an_invalid_name_returns_EINVALIDSPEC(void) diff --git a/tests/refs/reflog/reflog_helpers.c b/tests/refs/reflog/reflog_helpers.c index 5e3673651..6eba8ecf9 100644 --- a/tests/refs/reflog/reflog_helpers.c +++ b/tests/refs/reflog/reflog_helpers.c @@ -94,7 +94,7 @@ void cl_reflog_check_entry_(git_repository *repo, const char *reflog, size_t idx if (git_buf_len(&result) != 0) clar__fail(file, line, "Reflog entry mismatch", git_buf_cstr(&result), 1); - git_buf_free(&result); + git_buf_dispose(&result); git_reflog_free(log); } @@ -113,6 +113,6 @@ void reflog_print(git_repository *repo, const char *reflog_name) } fprintf(stderr, "%s", git_buf_cstr(&out)); - git_buf_free(&out); + git_buf_dispose(&out); git_reflog_free(reflog); } diff --git a/tests/refs/rename.c b/tests/refs/rename.c index 3e0be313c..e3e51485e 100644 --- a/tests/refs/rename.c +++ b/tests/refs/rename.c @@ -71,7 +71,7 @@ void test_refs_rename__loose(void) git_reference_free(new_ref); git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); + git_buf_dispose(&temp_path); } void test_refs_rename__packed(void) @@ -113,7 +113,7 @@ void test_refs_rename__packed(void) git_reference_free(new_ref); git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); + git_buf_dispose(&temp_path); } void test_refs_rename__packed_doesnt_pack_others(void) @@ -155,7 +155,7 @@ void test_refs_rename__packed_doesnt_pack_others(void) git_reference_free(renamed_ref); git_reference_free(another_looked_up_ref); - git_buf_free(&temp_path); + git_buf_dispose(&temp_path); } void test_refs_rename__name_collision(void) diff --git a/tests/refs/revparse.c b/tests/refs/revparse.c index 459188cf7..3c4ed9af5 100644 --- a/tests/refs/revparse.c +++ b/tests/refs/revparse.c @@ -338,7 +338,7 @@ static void create_fake_stash_reference_and_reflog(git_repository *repo) cl_assert_equal_i(true, git_path_isfile(git_buf_cstr(&log_path))); - git_buf_free(&log_path); + git_buf_dispose(&log_path); git_reference_free(new_master); } diff --git a/tests/repo/config.c b/tests/repo/config.c index 93dedd576..b92d84202 100644 --- a/tests/repo/config.c +++ b/tests/repo/config.c @@ -21,7 +21,7 @@ void test_repo_config__cleanup(void) { cl_sandbox_set_search_path_defaults(); - git_buf_free(&path); + git_buf_dispose(&path); cl_git_pass( git_futils_rmdir_r("alternate", NULL, GIT_RMDIR_REMOVE_FILES)); @@ -70,7 +70,7 @@ void test_repo_config__can_open_missing_global_with_separators(void) cl_git_pass(git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - git_buf_free(&path); + git_buf_dispose(&path); cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); cl_git_pass(git_repository_config(&config, repo)); diff --git a/tests/repo/discover.c b/tests/repo/discover.c index eadd055e9..b13c97bd9 100644 --- a/tests/repo/discover.c +++ b/tests/repo/discover.c @@ -37,8 +37,8 @@ static void ensure_repository_discover(const char *start_path, cl_assert_equal_s(found_path.ptr, resolved.ptr); - git_buf_free(&resolved); - git_buf_free(&found_path); + git_buf_dispose(&resolved); + git_buf_dispose(&found_path); } static void write_file(const char *path, const char *content) @@ -71,7 +71,7 @@ static void append_ceiling_dir(git_buf *ceiling_dirs, const char *path) git_buf_puts(ceiling_dirs, pretty_path.ptr); - git_buf_free(&pretty_path); + git_buf_dispose(&pretty_path); cl_assert(git_buf_oom(ceiling_dirs) == 0); } @@ -114,8 +114,8 @@ void test_repo_discover__initialize(void) void test_repo_discover__cleanup(void) { - git_buf_free(&discovered); - git_buf_free(&ceiling_dirs); + git_buf_dispose(&discovered); + git_buf_dispose(&ceiling_dirs); cl_git_pass(git_futils_rmdir_r(TEMP_REPO_FOLDER, NULL, GIT_RMDIR_REMOVE_FILES)); } diff --git a/tests/repo/env.c b/tests/repo/env.c index 6404f88e9..8e2e5f85f 100644 --- a/tests/repo/env.c +++ b/tests/repo/env.c @@ -45,7 +45,7 @@ static int GIT_FORMAT_PRINTF(2, 3) cl_setenv_printf(const char *name, const char va_end(args); ret = cl_setenv(name, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); return ret; } @@ -85,7 +85,7 @@ static void env_cd_( cl_must_pass(p_chdir(path)); passfail_(NULL, file, line); cl_must_pass(p_chdir(git_buf_cstr(&cwd_buf))); - git_buf_free(&cwd_buf); + git_buf_dispose(&cwd_buf); } #define env_cd_pass(path) env_cd_((path), env_pass_, __FILE__, __LINE__) #define env_cd_fail(path) env_cd_((path), env_fail_, __FILE__, __LINE__) @@ -271,7 +271,7 @@ void test_repo_env__open(void) cl_fixture_cleanup("testrepo.git"); cl_fixture_cleanup("attr"); - git_buf_free(&repo_dir_buf); + git_buf_dispose(&repo_dir_buf); clear_git_env(); } diff --git a/tests/repo/hashfile.c b/tests/repo/hashfile.c index ae8e122f6..3c27aafbf 100644 --- a/tests/repo/hashfile.c +++ b/tests/repo/hashfile.c @@ -35,7 +35,7 @@ void test_repo_hashfile__simple(void) cl_git_fail(git_odb_hashfile(&a, full.ptr, GIT_OBJ_ANY)); cl_git_fail(git_repository_hashfile(&b, _repo, full.ptr, GIT_OBJ_OFS_DELTA, NULL)); - git_buf_free(&full); + git_buf_dispose(&full); } void test_repo_hashfile__filtered(void) diff --git a/tests/repo/init.c b/tests/repo/init.c index 0f969eb18..2ac09e422 100644 --- a/tests/repo/init.c +++ b/tests/repo/init.c @@ -33,11 +33,11 @@ void test_repo_init__cleanup(void) { git_libgit2_opts(GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_GLOBAL, _global_path.ptr); - git_buf_free(&_global_path); + git_buf_dispose(&_global_path); if (_tmp_path.size > 0 && git_path_isdir(_tmp_path.ptr)) git_futils_rmdir_r(_tmp_path.ptr, NULL, GIT_RMDIR_REMOVE_FILES); - git_buf_free(&_tmp_path); + git_buf_dispose(&_tmp_path); } static void cleanup_repository(void *path) @@ -131,8 +131,8 @@ void test_repo_init__bare_repo_escaping_current_workdir(void) cl_git_pass(chdir(git_buf_cstr(&path_current_workdir))); - git_buf_free(&path_current_workdir); - git_buf_free(&path_repository); + git_buf_dispose(&path_current_workdir); + git_buf_dispose(&path_repository); cleanup_repository("a"); } @@ -193,7 +193,7 @@ void test_repo_init__additional_templates(void) cl_assert(git_path_isdir(git_buf_cstr(&path))); /* won't confirm specific contents of hooks dir since it may vary */ - git_buf_free(&path); + git_buf_dispose(&path); } static void assert_config_entry_on_init_bytype( @@ -423,7 +423,7 @@ void test_repo_init__relative_gitdir(void) cl_git_pass(git_futils_readbuffer(&dot_git_content, "root/b/c_wd/.git")); cl_assert_equal_s("gitdir: ../my_repository/", dot_git_content.ptr); - git_buf_free(&dot_git_content); + git_buf_dispose(&dot_git_content); cleanup_repository("root"); } @@ -444,7 +444,7 @@ void test_repo_init__relative_gitdir_2(void) /* make the directory first, then it should succeed */ cl_git_pass(git_repository_init_ext(&_repo, "root/b/my_repository", &opts)); - git_buf_free(&full_path); + git_buf_dispose(&full_path); cl_assert(!git__suffixcmp(git_repository_workdir(_repo), "root/b/c_wd/")); cl_assert(!git__suffixcmp(git_repository_path(_repo), "root/b/my_repository/")); @@ -460,7 +460,7 @@ void test_repo_init__relative_gitdir_2(void) cl_git_pass(git_futils_readbuffer(&dot_git_content, "root/b/c_wd/.git")); cl_assert_equal_s("gitdir: ../my_repository/", dot_git_content.ptr); - git_buf_free(&dot_git_content); + git_buf_dispose(&dot_git_content); cleanup_repository("root"); } @@ -497,8 +497,8 @@ static void assert_hooks_match( cl_assert_equal_i_fmt(expected_mode, st.st_mode, "%07o"); } - git_buf_free(&expected); - git_buf_free(&actual); + git_buf_dispose(&expected); + git_buf_dispose(&actual); } static void assert_mode_seems_okay( @@ -510,7 +510,7 @@ static void assert_mode_seems_okay( cl_git_pass(git_buf_joinpath(&full, base, path)); cl_git_pass(git_path_lstat(full.ptr, &st)); - git_buf_free(&full); + git_buf_dispose(&full); if (!core_filemode) { CLEAR_FOR_CORE_FILEMODE(expect_mode); @@ -552,11 +552,11 @@ static const char *template_sandbox(const char *name) /* create a file starting with a dot */ cl_git_pass(git_buf_joinpath(&dotfile_path, hooks_path.ptr, ".dotfile")); cl_git_mkfile(dotfile_path.ptr, "something\n"); - git_buf_free(&dotfile_path); + git_buf_dispose(&dotfile_path); - git_buf_free(&dotfile_path); - git_buf_free(&link_path); - git_buf_free(&hooks_path); + git_buf_dispose(&dotfile_path); + git_buf_dispose(&link_path); + git_buf_dispose(&hooks_path); return path; } @@ -581,8 +581,8 @@ static void configure_templatedir(const char *template_path) cl_git_mkfile(config_path.ptr, config_data.ptr); - git_buf_free(&config_path); - git_buf_free(&config_data); + git_buf_dispose(&config_path); + git_buf_dispose(&config_data); } static void validate_templates(git_repository *repo, const char *template_path) @@ -617,10 +617,10 @@ static void validate_templates(git_repository *repo, const char *template_path) template_path, git_repository_path(repo), "hooks/.dotfile", filemode); - git_buf_free(&expected); - git_buf_free(&actual); - git_buf_free(&repo_description); - git_buf_free(&template_description); + git_buf_dispose(&expected); + git_buf_dispose(&actual); + git_buf_dispose(&repo_description); + git_buf_dispose(&template_description); } void test_repo_init__external_templates_specified_in_options(void) @@ -666,7 +666,7 @@ void test_repo_init__external_templates_specified_in_config(void) validate_templates(_repo, "template"); cl_fixture_cleanup("template"); - git_buf_free(&template_path); + git_buf_dispose(&template_path); } void test_repo_init__external_templates_with_leading_dot(void) @@ -693,7 +693,7 @@ void test_repo_init__external_templates_with_leading_dot(void) validate_templates(_repo, ".template_with_leading_dot"); cl_fixture_cleanup(".template_with_leading_dot"); - git_buf_free(&template_path); + git_buf_dispose(&template_path); } void test_repo_init__extended_with_template_and_shared_mode(void) @@ -833,6 +833,6 @@ void test_repo_init__at_filesystem_root(void) cl_assert(git_path_isdir(root.ptr)); cl_git_pass(git_futils_rmdir_r(root.ptr, NULL, GIT_RMDIR_REMOVE_FILES)); - git_buf_free(&root); + git_buf_dispose(&root); git_repository_free(repo); } diff --git a/tests/repo/message.c b/tests/repo/message.c index 87574590b..14577c8f0 100644 --- a/tests/repo/message.c +++ b/tests/repo/message.c @@ -31,9 +31,9 @@ void test_repo_message__message(void) cl_git_pass(git_repository_message(&actual, _repo)); cl_assert_equal_s(expected, git_buf_cstr(&actual)); - git_buf_free(&actual); + git_buf_dispose(&actual); cl_git_pass(p_unlink(git_buf_cstr(&path))); cl_assert_equal_i(GIT_ENOTFOUND, git_repository_message(&actual, _repo)); - git_buf_free(&path); + git_buf_dispose(&path); } diff --git a/tests/repo/open.c b/tests/repo/open.c index ab36dd587..06ec71bfd 100644 --- a/tests/repo/open.c +++ b/tests/repo/open.c @@ -95,7 +95,7 @@ static void make_gitlink_dir(const char *dir, const char *linktext) cl_git_pass(git_futils_mkdir(dir, 0777, GIT_MKDIR_VERIFY_DIR)); cl_git_pass(git_buf_joinpath(&path, dir, ".git")); cl_git_rewritefile(path.ptr, linktext); - git_buf_free(&path); + git_buf_dispose(&path); } void test_repo_open__gitlinked(void) @@ -166,9 +166,9 @@ void test_repo_open__from_git_new_workdir(void) } } - git_buf_free(&link_tgt); - git_buf_free(&link); - git_buf_free(&body); + git_buf_dispose(&link_tgt); + git_buf_dispose(&link); + git_buf_dispose(&body); cl_git_pass(git_repository_open(&repo2, "alternate")); @@ -215,7 +215,7 @@ void test_repo_open__failures(void) GIT_REPOSITORY_OPEN_NO_SEARCH | GIT_REPOSITORY_OPEN_NO_DOTGIT, NULL)); - git_buf_free(&ceiling); + git_buf_dispose(&ceiling); } void test_repo_open__bad_gitlinks(void) @@ -308,7 +308,7 @@ void test_repo_open__win32_path(void) cl_assert(git__suffixcmp(git_repository_workdir(repo2), repo_wd) == 0); git_repository_free(repo2); - git_buf_free(&winpath); + git_buf_dispose(&winpath); #endif } @@ -342,7 +342,7 @@ void test_repo_open__no_config(void) cl_git_pass(git_libgit2_opts( GIT_OPT_SET_SEARCH_PATH, GIT_CONFIG_LEVEL_XDG, path.ptr)); - git_buf_free(&path); + git_buf_dispose(&path); cl_git_pass(git_repository_open(&repo, "empty_standard_repo")); cl_git_pass(git_repository_config(&config, repo)); diff --git a/tests/repo/repo_helpers.c b/tests/repo/repo_helpers.c index 61f696865..4dc5bfc6f 100644 --- a/tests/repo/repo_helpers.c +++ b/tests/repo/repo_helpers.c @@ -18,5 +18,5 @@ void delete_head(git_repository* repo) cl_git_pass(git_buf_joinpath(&head_path, git_repository_path(repo), GIT_HEAD_FILE)); cl_git_pass(p_unlink(git_buf_cstr(&head_path))); - git_buf_free(&head_path); + git_buf_dispose(&head_path); } diff --git a/tests/repo/reservedname.c b/tests/repo/reservedname.c index 2a5b38239..8e024bcbb 100644 --- a/tests/repo/reservedname.c +++ b/tests/repo/reservedname.c @@ -128,5 +128,5 @@ void test_repo_reservedname__submodule_pointer_during_create(void) cl_git_pass(git_submodule_update(sm, 1, &update_options)); git_submodule_free(sm); - git_buf_free(&url); + git_buf_dispose(&url); } diff --git a/tests/repo/setters.c b/tests/repo/setters.c index 5a83fdbee..ea6ef12b1 100644 --- a/tests/repo/setters.c +++ b/tests/repo/setters.c @@ -56,13 +56,13 @@ void test_repo_setters__setting_a_workdir_creates_a_gitlink(void) cl_git_pass(git_futils_readbuffer(&content, "./new_workdir/.git")); cl_assert(git__prefixcmp(git_buf_cstr(&content), "gitdir: ") == 0); cl_assert(git__suffixcmp(git_buf_cstr(&content), "testrepo.git/") == 0); - git_buf_free(&content); + git_buf_dispose(&content); cl_git_pass(git_repository_config(&cfg, repo)); cl_git_pass(git_config_get_string_buf(&buf, cfg, "core.worktree")); cl_assert(git__suffixcmp(git_buf_cstr(&buf), "new_workdir/") == 0); - git_buf_free(&buf); + git_buf_dispose(&buf); git_config_free(cfg); } diff --git a/tests/repo/state.c b/tests/repo/state.c index 7f20eebe8..fb8949775 100644 --- a/tests/repo/state.c +++ b/tests/repo/state.c @@ -15,7 +15,7 @@ void test_repo_state__initialize(void) void test_repo_state__cleanup(void) { cl_git_sandbox_cleanup(); - git_buf_free(&_path); + git_buf_dispose(&_path); } static void setup_simple_state(const char *filename) diff --git a/tests/reset/hard.c b/tests/reset/hard.c index 69ef41e50..c63640e1c 100644 --- a/tests/reset/hard.c +++ b/tests/reset/hard.c @@ -83,8 +83,8 @@ void test_reset_hard__resetting_reverts_modified_files(void) } } - git_buf_free(&content); - git_buf_free(&path); + git_buf_dispose(&content); + git_buf_dispose(&path); } void test_reset_hard__cannot_reset_in_a_bare_repository(void) @@ -192,10 +192,10 @@ void test_reset_hard__cleans_up_merge(void) cl_assert(git_path_exists(git_buf_cstr(&orig_head_path))); cl_git_pass(p_unlink(git_buf_cstr(&orig_head_path))); - git_buf_free(&merge_head_path); - git_buf_free(&merge_msg_path); - git_buf_free(&merge_mode_path); - git_buf_free(&orig_head_path); + git_buf_dispose(&merge_head_path); + git_buf_dispose(&merge_msg_path); + git_buf_dispose(&merge_mode_path); + git_buf_dispose(&orig_head_path); } void test_reset_hard__reflog_is_correct(void) @@ -223,7 +223,7 @@ void test_reset_hard__reflog_is_correct(void) reflog_check(repo, "HEAD", 4, NULL, git_buf_cstr(&buf)); reflog_check(repo, "refs/heads/master", 4, NULL, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); /* Moved branch, expect revspec in message */ exp_msg = "reset: moving to HEAD~^{commit}"; diff --git a/tests/reset/mixed.c b/tests/reset/mixed.c index 97eac74e8..9928c6871 100644 --- a/tests/reset/mixed.c +++ b/tests/reset/mixed.c @@ -73,7 +73,7 @@ void test_reset_mixed__reflog_is_correct(void) cl_git_pass(git_reset(repo, target, GIT_RESET_MIXED, NULL)); reflog_check(repo, "HEAD", 10, NULL, git_buf_cstr(&buf)); reflog_check(repo, "refs/heads/master", 10, NULL, git_buf_cstr(&buf)); - git_buf_free(&buf); + git_buf_dispose(&buf); /* Moved branch, expect revspec in message */ exp_msg = "reset: moving to HEAD~^{commit}"; diff --git a/tests/reset/soft.c b/tests/reset/soft.c index 506decaed..0ad47be2c 100644 --- a/tests/reset/soft.c +++ b/tests/reset/soft.c @@ -127,7 +127,7 @@ void test_reset_soft__fails_when_merging(void) cl_assert_equal_i(GIT_EUNMERGED, git_reset(repo, target, GIT_RESET_SOFT, NULL)); cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path))); - git_buf_free(&merge_head_path); + git_buf_dispose(&merge_head_path); } void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE_HEAD_file_existence(void) @@ -142,7 +142,7 @@ void test_reset_soft__fails_when_index_contains_conflicts_independently_of_MERGE cl_git_pass(git_buf_joinpath(&merge_head_path, git_repository_path(repo), "MERGE_HEAD")); cl_git_pass(p_unlink(git_buf_cstr(&merge_head_path))); - git_buf_free(&merge_head_path); + git_buf_dispose(&merge_head_path); cl_git_pass(git_repository_index(&index, repo)); cl_assert_equal_i(true, git_index_has_conflicts(index)); diff --git a/tests/revert/workdir.c b/tests/revert/workdir.c index 802819c75..86047350a 100644 --- a/tests/revert/workdir.c +++ b/tests/revert/workdir.c @@ -126,8 +126,8 @@ void test_revert_workdir__conflicts(void) git_commit_free(commit); git_commit_free(head); git_reference_free(head_ref); - git_buf_free(&mergemsg_buf); - git_buf_free(&conflicting_buf); + git_buf_dispose(&mergemsg_buf); + git_buf_dispose(&conflicting_buf); } /* git reset --hard 39467716290f6df775a91cdb9a4eb39295018145 @@ -350,7 +350,7 @@ void test_revert_workdir__again_after_edit_two(void) git_commit_free(revert_commit); git_commit_free(head_commit); git_config_free(config); - git_buf_free(&diff_buf); + git_buf_dispose(&diff_buf); } /* git reset --hard 72333f47d4e83616630ff3b0ffe4c0faebcc3c45 diff --git a/tests/stash/apply.c b/tests/stash/apply.c index f26b73b19..986eba0f3 100644 --- a/tests/stash/apply.c +++ b/tests/stash/apply.c @@ -85,7 +85,7 @@ void test_stash_apply__with_default(void) cl_git_pass(git_futils_readbuffer(&where, "stash/where")); cl_assert_equal_s("....\n", where.ptr); - git_buf_free(&where); + git_buf_dispose(&where); } void test_stash_apply__with_existing_file(void) @@ -132,7 +132,7 @@ void test_stash_apply__with_reinstate_index(void) cl_git_pass(git_futils_readbuffer(&where, "stash/where")); cl_assert_equal_s("....\n", where.ptr); - git_buf_free(&where); + git_buf_dispose(&where); } void test_stash_apply__conflict_index_with_default(void) diff --git a/tests/status/ignore.c b/tests/status/ignore.c index dc58e8b45..ed6df9528 100644 --- a/tests/status/ignore.c +++ b/tests/status/ignore.c @@ -601,7 +601,7 @@ void test_status_ignore__filenames_with_special_prefixes_do_not_interfere_with_s cl_assert(st.status == GIT_STATUS_WT_NEW); cl_git_sandbox_cleanup(); - git_buf_free(&file); + git_buf_dispose(&file); } } diff --git a/tests/status/renames.c b/tests/status/renames.c index ae32d2ee0..445995264 100644 --- a/tests/status/renames.c +++ b/tests/status/renames.c @@ -35,8 +35,8 @@ static void _rename_helper( if (extra) cl_git_append2file(newpath.ptr, extra); - git_buf_free(&oldpath); - git_buf_free(&newpath); + git_buf_dispose(&oldpath); + git_buf_dispose(&newpath); } #define rename_file(R,O,N) _rename_helper((R), (O), (N), NULL) diff --git a/tests/status/worktree.c b/tests/status/worktree.c index c6b18c166..bb9f8ec97 100644 --- a/tests/status/worktree.c +++ b/tests/status/worktree.c @@ -127,7 +127,7 @@ void test_status_worktree__purged_worktree(void) /* first purge the contents of the worktree */ cl_git_pass(git_buf_sets(&workdir, git_repository_workdir(repo))); cl_git_pass(git_path_direach(&workdir, 0, remove_file_cb, NULL)); - git_buf_free(&workdir); + git_buf_dispose(&workdir); /* now get status */ memset(&counts, 0x0, sizeof(status_entry_counts)); @@ -378,7 +378,7 @@ void test_status_worktree__issue_592(void) cl_git_pass(git_status_foreach(repo, cb_status__check_592, "l.txt")); - git_buf_free(&path); + git_buf_dispose(&path); } void test_status_worktree__issue_592_2(void) @@ -393,7 +393,7 @@ void test_status_worktree__issue_592_2(void) cl_git_pass(git_status_foreach(repo, cb_status__check_592, "c/a.txt")); - git_buf_free(&path); + git_buf_dispose(&path); } void test_status_worktree__issue_592_3(void) @@ -409,7 +409,7 @@ void test_status_worktree__issue_592_3(void) cl_git_pass(git_status_foreach(repo, cb_status__check_592, "c/a.txt")); - git_buf_free(&path); + git_buf_dispose(&path); } void test_status_worktree__issue_592_4(void) @@ -424,7 +424,7 @@ void test_status_worktree__issue_592_4(void) cl_git_pass(git_status_foreach(repo, cb_status__check_592, "t/b.txt")); - git_buf_free(&path); + git_buf_dispose(&path); } void test_status_worktree__issue_592_5(void) @@ -440,7 +440,7 @@ void test_status_worktree__issue_592_5(void) cl_git_pass(git_status_foreach(repo, cb_status__check_592, NULL)); - git_buf_free(&path); + git_buf_dispose(&path); } void test_status_worktree__issue_592_ignores_0(void) @@ -782,8 +782,8 @@ static void assert_ignore_case( cl_assert_equal_i(expected_camel_cased_file_status, status); git_repository_free(repo2); - git_buf_free(&lower_case_path); - git_buf_free(&camel_case_path); + git_buf_dispose(&lower_case_path); + git_buf_dispose(&camel_case_path); } void test_status_worktree__file_status_honors_core_ignorecase_true(void) diff --git a/tests/stress/diff.c b/tests/stress/diff.c index a3ba4fab3..2ea0d4076 100644 --- a/tests/stress/diff.c +++ b/tests/stress/diff.c @@ -108,7 +108,7 @@ void test_stress_diff__rename_big_files(void) cl_git_pass(git_index_add_bypath(index, tmp + strlen("renames/"))); } - git_buf_free(&b); + git_buf_dispose(&b); git_index_free(index); test_with_many(100); @@ -133,7 +133,7 @@ void test_stress_diff__rename_many_files(void) b.ptr[8] = '\n'; cl_git_mkfile(tmp, b.ptr); } - git_buf_free(&b); + git_buf_dispose(&b); for (i = 0; i < 2500; i += 1) { p_snprintf(tmp, sizeof(tmp), "renames/newfile%03d", i); 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) diff --git a/tests/win32/longpath.c b/tests/win32/longpath.c index 5a36875ed..f5a95346b 100644 --- a/tests/win32/longpath.c +++ b/tests/win32/longpath.c @@ -28,7 +28,7 @@ void test_win32_longpath__initialize(void) void test_win32_longpath__cleanup(void) { - git_buf_free(&path); + git_buf_dispose(&path); } #ifdef GIT_WIN32 diff --git a/tests/worktree/merge.c b/tests/worktree/merge.c index 36cc2a6c1..4b743829c 100644 --- a/tests/worktree/merge.c +++ b/tests/worktree/merge.c @@ -76,7 +76,7 @@ void test_worktree_merge__merge_setup(void) cl_assert(git_path_exists(path.ptr)); } - git_buf_free(&path); + git_buf_dispose(&path); git_reference_free(ours_ref); git_reference_free(theirs_ref); git_annotated_commit_free(ours); @@ -115,7 +115,7 @@ void test_worktree_merge__merge_conflict(void) cl_git_pass(git_futils_readbuffer(&buf, path.ptr)); cl_assert_equal_s(buf.ptr, CONFLICT_BRANCH_FILE_TXT); - git_buf_free(&path); - git_buf_free(&buf); + git_buf_dispose(&path); + git_buf_dispose(&buf); } diff --git a/tests/worktree/open.c b/tests/worktree/open.c index 74b9007d9..8ea43b2fa 100644 --- a/tests/worktree/open.c +++ b/tests/worktree/open.c @@ -32,7 +32,7 @@ static void assert_worktree_valid(git_repository *wt, const char *parentdir, con cl_git_pass(git_path_to_dir(&path)); cl_assert_equal_s(wt->gitdir, path.ptr); - git_buf_free(&path); + git_buf_dispose(&path); } void test_worktree_open__initialize(void) @@ -82,7 +82,7 @@ void test_worktree_open__repository_through_gitdir(void) cl_git_pass(git_repository_open(&wt, gitdir_path.ptr)); assert_worktree_valid(wt, COMMON_REPO, WORKTREE_REPO); - git_buf_free(&gitdir_path); + git_buf_dispose(&gitdir_path); git_repository_free(wt); } @@ -97,7 +97,7 @@ void test_worktree_open__open_discovered_worktree(void) cl_assert_equal_s(git_repository_workdir(fixture.worktree), git_repository_workdir(repo)); - git_buf_free(&path); + git_buf_dispose(&path); git_repository_free(repo); } diff --git a/tests/worktree/refs.c b/tests/worktree/refs.c index ea36e80e2..e62149d2e 100644 --- a/tests/worktree/refs.c +++ b/tests/worktree/refs.c @@ -191,5 +191,5 @@ void test_worktree_refs__creating_refs_uses_commondir(void) git_reference_free(branch); git_reference_free(head); git_commit_free(commit); - git_buf_free(&refpath); + git_buf_dispose(&refpath); } diff --git a/tests/worktree/submodule.c b/tests/worktree/submodule.c index 294385226..2e62c039c 100644 --- a/tests/worktree/submodule.c +++ b/tests/worktree/submodule.c @@ -55,7 +55,7 @@ void test_worktree_submodule__open_discovered_submodule_worktree(void) cl_assert_equal_s(git_repository_workdir(child.worktree), git_repository_workdir(repo)); - git_buf_free(&path); + git_buf_dispose(&path); git_repository_free(repo); } @@ -86,7 +86,7 @@ void test_worktree_submodule__resolve_relative_url(void) git_worktree_free(wt); git_repository_free(repo); - git_buf_free(&wt_path); - git_buf_free(&sm_relative_path); - git_buf_free(&wt_relative_path); + git_buf_dispose(&wt_path); + git_buf_dispose(&sm_relative_path); + git_buf_dispose(&wt_relative_path); } diff --git a/tests/worktree/worktree.c b/tests/worktree/worktree.c index cbdd0847d..83be09760 100644 --- a/tests/worktree/worktree.c +++ b/tests/worktree/worktree.c @@ -70,7 +70,7 @@ void test_worktree_worktree__list_with_invalid_worktree_dirs(void) } } - git_buf_free(&path); + git_buf_dispose(&path); } void test_worktree_worktree__list_in_worktree_repo(void) @@ -123,7 +123,7 @@ void test_worktree_worktree__lookup(void) cl_assert_equal_s(wt->commondir_path, fixture.repo->gitdir); cl_assert_equal_s(wt->commondir_path, fixture.repo->commondir); - git_buf_free(&gitdir_path); + git_buf_dispose(&gitdir_path); git_worktree_free(wt); } @@ -165,8 +165,8 @@ void test_worktree_worktree__open_invalid_commondir(void) cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_git_fail(git_repository_open_from_worktree(&repo, wt)); - git_buf_free(&buf); - git_buf_free(&path); + git_buf_dispose(&buf); + git_buf_dispose(&path); git_worktree_free(wt); } @@ -185,8 +185,8 @@ void test_worktree_worktree__open_invalid_gitdir(void) cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_git_fail(git_repository_open_from_worktree(&repo, wt)); - git_buf_free(&buf); - git_buf_free(&path); + git_buf_dispose(&buf); + git_buf_dispose(&path); git_worktree_free(wt); } @@ -203,7 +203,7 @@ void test_worktree_worktree__open_invalid_parent(void) cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_git_fail(git_repository_open_from_worktree(&repo, wt)); - git_buf_free(&buf); + git_buf_dispose(&buf); git_worktree_free(wt); } @@ -222,7 +222,7 @@ void test_worktree_worktree__init(void) cl_assert(git__suffixcmp(git_repository_workdir(repo), "worktree-new/") == 0); cl_git_pass(git_branch_lookup(&branch, repo, "worktree-new", GIT_BRANCH_LOCAL)); - git_buf_free(&path); + git_buf_dispose(&path); git_worktree_free(wt); git_reference_free(branch); git_repository_free(repo); @@ -267,7 +267,7 @@ void test_worktree_worktree__add_locked(void) cl_assert(git__suffixcmp(git_repository_workdir(repo), "worktree-locked/") == 0); cl_git_pass(git_branch_lookup(&branch, repo, "worktree-locked", GIT_BRANCH_LOCAL)); - git_buf_free(&path); + git_buf_dispose(&path); git_worktree_free(wt); git_reference_free(branch); git_repository_free(repo); @@ -287,7 +287,7 @@ void test_worktree_worktree__init_existing_branch(void) cl_git_pass(git_buf_joinpath(&path, fixture.repo->workdir, "../worktree-new")); cl_git_fail(git_worktree_add(&wt, fixture.repo, "worktree-new", path.ptr, NULL)); - git_buf_free(&path); + git_buf_dispose(&path); git_commit_free(commit); git_reference_free(head); git_reference_free(branch); @@ -314,7 +314,7 @@ void test_worktree_worktree__add_with_explicit_branch(void) cl_git_pass(git_repository_head(&wthead, wtrepo)); cl_assert_equal_s(git_reference_name(wthead), "refs/heads/worktree-with-ref"); - git_buf_free(&path); + git_buf_dispose(&path); git_commit_free(commit); git_reference_free(head); git_reference_free(branch); @@ -335,7 +335,7 @@ void test_worktree_worktree__init_existing_worktree(void) cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_assert_equal_s(wt->gitlink_path, fixture.worktree->gitlink); - git_buf_free(&path); + git_buf_dispose(&path); git_worktree_free(wt); } @@ -364,7 +364,7 @@ void test_worktree_worktree__init_existing_path(void) cl_assert(!git_path_exists(path.ptr)); } - git_buf_free(&path); + git_buf_dispose(&path); } void test_worktree_worktree__init_submodule(void) @@ -390,7 +390,7 @@ void test_worktree_worktree__init_submodule(void) cl_git_pass(git_buf_joinpath(&path, sm->gitdir, "worktrees/repo-worktree/")); cl_assert_equal_s(path.ptr, wt->gitdir); - git_buf_free(&path); + git_buf_dispose(&path); git_worktree_free(worktree); git_repository_free(sm); git_repository_free(wt); @@ -424,8 +424,8 @@ void test_worktree_worktree__path(void) cl_git_pass(git_buf_joinpath(&expected_path, clar_sandbox_path(), "testrepo-worktree")); cl_git_pass(git_worktree_lookup(&wt, fixture.repo, "testrepo-worktree")); cl_assert_equal_s(git_worktree_path(wt), expected_path.ptr); - - git_buf_free(&expected_path); + + git_buf_dispose(&expected_path); git_worktree_free(wt); } @@ -482,7 +482,7 @@ void test_worktree_worktree__lock_with_reason(void) cl_assert_equal_s(reason.ptr, "because"); cl_assert(wt->locked); - git_buf_free(&reason); + git_buf_dispose(&reason); git_worktree_free(wt); } @@ -499,7 +499,7 @@ void test_worktree_worktree__lock_without_reason(void) cl_assert_equal_i(reason.size, 0); cl_assert(wt->locked); - git_buf_free(&reason); + git_buf_dispose(&reason); git_worktree_free(wt); } |