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.

1 files changed, 13 insertions, 13 deletions

diff --git a/tests/pack/indexer.c b/tests/pack/indexer.c
index 422c3def4..5958bc4ba 100644
--- a/tests/pack/indexer.c
+++ b/tests/pack/indexer.c
@@ -279,10 +279,10 @@ void test_pack_indexer__out_of_order_with_connectivity_checks(void)
 	git_indexer_free(idx);
 }
 
-static int find_tmp_file_recurs(void *opaque, git_buf *path)
+static int find_tmp_file_recurs(void *opaque, git_str *path)
 {
 	int error = 0;
-	git_buf *first_tmp_file = opaque;
+	git_str *first_tmp_file = opaque;
 	struct stat st;
 
 	if ((error = p_lstat_posixly(path->ptr, &st)) < 0)
@@ -292,8 +292,8 @@ static int find_tmp_file_recurs(void *opaque, git_buf *path)
 		return git_path_direach(path, 0, find_tmp_file_recurs, opaque);
 
 	/* This is the template that's used in git_futils_mktmp. */
-	if (strstr(git_buf_cstr(path), "_git2_") != NULL)
-		return git_buf_sets(first_tmp_file, git_buf_cstr(path));
+	if (strstr(git_str_cstr(path), "_git2_") != NULL)
+		return git_str_sets(first_tmp_file, git_str_cstr(path));
 
 	return 0;
 }
@@ -301,21 +301,21 @@ static int find_tmp_file_recurs(void *opaque, git_buf *path)
 void test_pack_indexer__no_tmp_files(void)
 {
 	git_indexer *idx = NULL;
-	git_buf path = GIT_BUF_INIT;
-	git_buf first_tmp_file = GIT_BUF_INIT;
+	git_str path = GIT_STR_INIT;
+	git_str first_tmp_file = GIT_STR_INIT;
 
 	/* Precondition: there are no temporary files. */
-	cl_git_pass(git_buf_sets(&path, clar_sandbox_path()));
+	cl_git_pass(git_str_sets(&path, clar_sandbox_path()));
 	cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path));
-	git_buf_dispose(&path);
-	cl_assert(git_buf_len(&first_tmp_file) == 0);
+	git_str_dispose(&path);
+	cl_assert(git_str_len(&first_tmp_file) == 0);
 
 	cl_git_pass(git_indexer_new(&idx, ".", 0, NULL, NULL));
 	git_indexer_free(idx);
 
-	cl_git_pass(git_buf_sets(&path, clar_sandbox_path()));
+	cl_git_pass(git_str_sets(&path, clar_sandbox_path()));
 	cl_git_pass(find_tmp_file_recurs(&first_tmp_file, &path));
-	git_buf_dispose(&path);
-	cl_assert(git_buf_len(&first_tmp_file) == 0);
-	git_buf_dispose(&first_tmp_file);
+	git_str_dispose(&path);
+	cl_assert(git_str_len(&first_tmp_file) == 0);
+	git_str_dispose(&first_tmp_file);
 }