diff options
author | Nika Layzell <nika@thelayzells.com> | 2018-06-14 22:48:58 -0700 |
---|---|---|
committer | Nika Layzell <nika@thelayzells.com> | 2018-06-14 22:49:01 -0700 |
commit | 9faf36a6e89d1cc161bb6bf3afff7a3552b8a349 (patch) | |
tree | 84cbe7040ad24f089b3cf5df088a1447add62341 | |
parent | d91d2968a662ee2b2120c3b44aa6956d9ac57b89 (diff) | |
download | libgit2-9faf36a6e89d1cc161bb6bf3afff7a3552b8a349.tar.gz |
mailmap: git_buf_free => git_buf_dispose
-rw-r--r-- | src/mailmap.c | 18 | ||||
-rw-r--r-- | tests/mailmap/parsing.c | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/mailmap.c b/src/mailmap.c index f249c5261..b5fb7f69c 100644 --- a/src/mailmap.c +++ b/src/mailmap.c @@ -265,10 +265,10 @@ int git_mailmap_add_buffer(git_mailmap *mm, const char *buf, size_t len) } cleanup: - git_buf_free(&real_name); - git_buf_free(&real_email); - git_buf_free(&replace_name); - git_buf_free(&replace_email); + git_buf_dispose(&real_name); + git_buf_dispose(&real_email); + git_buf_dispose(&replace_name); + git_buf_dispose(&replace_email); return error; } @@ -313,7 +313,7 @@ static int mailmap_add_blob( goto cleanup; cleanup: - git_buf_free(&content); + git_buf_dispose(&content); git_blob_free(blob); git_object_free(object); return error; @@ -340,8 +340,8 @@ static int mailmap_add_file_ondisk( goto cleanup; cleanup: - git_buf_free(&fullpath); - git_buf_free(&content); + git_buf_dispose(&fullpath); + git_buf_dispose(&content); return error; } @@ -386,8 +386,8 @@ static void mailmap_add_from_repository(git_mailmap *mm, git_repository *repo) if (path != NULL) mailmap_add_file_ondisk(mm, path, repo); - git_buf_free(&rev_buf); - git_buf_free(&path_buf); + git_buf_dispose(&rev_buf); + git_buf_dispose(&path_buf); git_config_free(config); } diff --git a/tests/mailmap/parsing.c b/tests/mailmap/parsing.c index 2cb830450..d3efe400e 100644 --- a/tests/mailmap/parsing.c +++ b/tests/mailmap/parsing.c @@ -88,7 +88,7 @@ void test_mailmap_parsing__windows_string(void) git_buf_text_lf_to_crlf(&winbuf, &unixbuf); cl_git_pass(git_mailmap_from_buffer(&g_mailmap, winbuf.ptr, winbuf.size)); - git_buf_free(&winbuf); + git_buf_dispose(&winbuf); /* We should have parsed all of the entries */ check_mailmap_entries(g_mailmap, entries, ARRAY_SIZE(entries)); |