From f0e693b18afbe1de37d7da5b5a8967b6c87d8e53 Mon Sep 17 00:00:00 2001 From: Edward Thomson Date: Tue, 7 Sep 2021 17:53:49 -0400 Subject: str: introduce `git_str` for internal, `git_buf` is external 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. --- tests/object/raw/hash.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/object/raw') diff --git a/tests/object/raw/hash.c b/tests/object/raw/hash.c index 3be1f83b3..5a3e81855 100644 --- a/tests/object/raw/hash.c +++ b/tests/object/raw/hash.c @@ -56,7 +56,7 @@ void test_object_raw_hash__hash_buffer_in_single_call(void) void test_object_raw_hash__hash_vector(void) { git_oid id1, id2; - git_buf_vec vec[2]; + git_str_vec vec[2]; cl_git_pass(git_oid_fromstr(&id1, hello_id)); -- cgit v1.2.1