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, 10 insertions, 11 deletions

diff --git a/tests/win32/longpath.c b/tests/win32/longpath.c
index f8b8c4b0a..4be86db5a 100644
--- a/tests/win32/longpath.c
+++ b/tests/win32/longpath.c
@@ -2,11 +2,10 @@
 
 #include "git2/clone.h"
 #include "clone.h"
-#include "buffer.h"
 #include "futils.h"
 #include "repository.h"
 
-static git_buf path = GIT_BUF_INIT;
+static git_str path = GIT_STR_INIT;
 
 #define LONG_FILENAME "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.txt"
 
@@ -18,20 +17,20 @@ void test_win32_longpath__initialize(void)
 	size_t remain = MAX_PATH - base_len;
 	size_t i;
 
-	git_buf_clear(&path);
-	git_buf_puts(&path, base);
-	git_buf_putc(&path, '/');
+	git_str_clear(&path);
+	git_str_puts(&path, base);
+	git_str_putc(&path, '/');
 
 	cl_assert(remain < (MAX_PATH - 5));
 
 	for (i = 0; i < (remain - 5); i++)
-		git_buf_putc(&path, 'a');
+		git_str_putc(&path, 'a');
 #endif
 }
 
 void test_win32_longpath__cleanup(void)
 {
-	git_buf_dispose(&path);
+	git_str_dispose(&path);
 	cl_git_sandbox_cleanup();
 }
 
@@ -49,7 +48,7 @@ void test_win32_longpath__workdir_path_validated(void)
 {
 #ifdef GIT_WIN32
 	git_repository *repo = cl_git_sandbox_init("testrepo");
-	git_buf out = GIT_BUF_INIT;
+	git_str out = GIT_STR_INIT;
 
 	cl_git_pass(git_repository_workdir_path(&out, repo, "a.txt"));
 
@@ -60,7 +59,7 @@ void test_win32_longpath__workdir_path_validated(void)
 	cl_repo_set_bool(repo, "core.longpaths", true);
 	cl_git_pass(git_repository_workdir_path(&out, repo, "aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa.txt"));
 	cl_git_pass(git_repository_workdir_path(&out, repo, LONG_FILENAME));
-	git_buf_dispose(&out);
+	git_str_dispose(&out);
 #endif
 }
 
@@ -68,7 +67,7 @@ void test_win32_longpath__workdir_path_validated(void)
 static void assert_longpath_status_and_add(git_repository *repo, const char *wddata, const char *repodata) {
 	git_index *index;
 	git_blob *blob;
-	git_buf out = GIT_BUF_INIT;
+	git_str out = GIT_STR_INIT;
 	const git_index_entry *entry;
 	unsigned int status_flags;
 
@@ -91,7 +90,7 @@ static void assert_longpath_status_and_add(git_repository *repo, const char *wdd
 
 	git_blob_free(blob);
 	git_index_free(index);
-	git_buf_dispose(&out);
+	git_str_dispose(&out);
 }
 #endif