diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2021-09-07 17:53:49 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@edwardthomson.com> | 2021-10-17 09:49:01 -0400 |
| commit | f0e693b18afbe1de37d7da5b5a8967b6c87d8e53 (patch) | |
| tree | be5e1cdbfa218ba81ec06bf45e45cfeb7f79a2a5 /tests/diff/blob.c | |
| parent | 5346be3ddd3bcf19779c5d62e71f8442a0171133 (diff) | |
| download | libgit2-ethomson/gitstr.tar.gz | |
str: introduce `git_str` for internal, `git_buf` is externalethomson/gitstr
libgit2 has two distinct requirements that were previously solved by
`git_buf`. We require:
1. A general purpose string class that provides a number of utility APIs
for manipulating data (eg, concatenating, truncating, etc).
2. A structure that we can use to return strings to callers that they
can take ownership of.
By using a single class (`git_buf`) for both of these purposes, we have
confused the API to the point that refactorings are difficult and
reasoning about correctness is also difficult.
Move the utility class `git_buf` to be called `git_str`: this represents
its general purpose, as an internal string buffer class. The name also
is an homage to Junio Hamano ("gitstr").
The public API remains `git_buf`, and has a much smaller footprint. It
is generally only used as an "out" param with strict requirements that
follow the documentation. (Exceptions exist for some legacy APIs to
avoid breaking callers unnecessarily.)
Utility functions exist to convert a user-specified `git_buf` to a
`git_str` so that we can call internal functions, then converting it
back again.
Diffstat (limited to 'tests/diff/blob.c')
| -rw-r--r-- | tests/diff/blob.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/diff/blob.c b/tests/diff/blob.c index 50edf6bc0..9f71e4ea6 100644 --- a/tests/diff/blob.c +++ b/tests/diff/blob.c @@ -915,7 +915,7 @@ void test_diff_blob__using_path_and_attributes(void) "+More lines\n" "+And more\n" "+Go here\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); cl_git_pass(git_patch_from_blob_and_buffer( @@ -925,7 +925,7 @@ void test_diff_blob__using_path_and_attributes(void) "diff --git a/zzz.binary b/zzz.binary\n" "index 45141a7..75b0dbb 100644\n" "Binary files a/zzz.binary and b/zzz.binary differ\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); cl_git_pass(git_patch_from_blob_and_buffer( @@ -940,7 +940,7 @@ void test_diff_blob__using_path_and_attributes(void) "+More lines\n" "+And more\n" "+Go here\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); cl_git_pass(git_patch_from_blob_and_buffer( @@ -955,7 +955,7 @@ void test_diff_blob__using_path_and_attributes(void) "+More lines\n" "+And more\n" "+Go here\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); /* "0123456789\n\x01\x02\x03\x04\x05\x06\x07\x08\x09\x00\n0123456789\n" @@ -971,7 +971,7 @@ void test_diff_blob__using_path_and_attributes(void) "diff --git a/zzz.normal b/zzz.normal\n" "index b435cd5..1604519 100644\n" "Binary files a/zzz.normal and b/zzz.normal differ\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); cl_git_pass(git_patch_from_blob_and_buffer( @@ -985,7 +985,7 @@ void test_diff_blob__using_path_and_attributes(void) "@@ -3 +3 @@\n" "-0123456789\n" "+replace a line\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); cl_git_pass(git_patch_from_blob_and_buffer( @@ -999,7 +999,7 @@ void test_diff_blob__using_path_and_attributes(void) "@@ -3 +3 @@\n" "-0123456789\n" "+replace a line\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); cl_git_pass(git_patch_from_blob_and_buffer( @@ -1013,7 +1013,7 @@ void test_diff_blob__using_path_and_attributes(void) "@@ -3 +3 @@ 0123456789\n" "-0123456789\n" "+replace a line\n", buf.ptr); - git_buf_clear(&buf); + git_buf_dispose(&buf); git_patch_free(p); git_buf_dispose(&buf); |