Merge git_buf and git_buffer

This makes the git_buf struct that was used internally into an
externally available structure and eliminates the git_buffer.

As part of that, some of the special cases that arose with the
externally used git_buffer were blended into the git_buf, such as
being careful about git_buf objects that may have a NULL ptr and
allowing for bufs with a valid ptr and size but zero asize as a
way of referring to externally owned data.

1 files changed, 3 insertions, 3 deletions

diff --git a/src/diff_file.c b/src/diff_file.c
index d02787c75..5939ee8b8 100644
--- a/src/diff_file.c
+++ b/src/diff_file.c
@@ -327,11 +327,11 @@ static int diff_file_content_load_workdir_file(
 	}
 
 	if (!(error = git_futils_readbuffer_fd(&raw, fd, (size_t)fc->file->size))) {
-		git_buffer in = GIT_BUFFER_FROM_BUF(&raw), out = GIT_BUFFER_INIT;
+		git_buf out = GIT_BUF_INIT;
 
-		error = git_filter_list_apply_to_data(&out, fl, &in);
+		error = git_filter_list_apply_to_data(&out, fl, &raw);
 
-		git_buffer_free(&in);
+		git_buf_free(&raw);
 
 		if (!error) {
 			fc->map.len  = out.size;