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, 4 insertions, 4 deletions

diff --git a/src/odb.c b/src/odb.c
index b71b038bf..eef9748ca 100644
--- a/src/odb.c
+++ b/src/odb.c
@@ -192,16 +192,16 @@ int git_odb__hashfd_filtered(
 	 */
 
 	if (!(error = git_futils_readbuffer_fd(&raw, fd, size))) {
-		git_buffer pre = GIT_BUFFER_FROM_BUF(&raw), post = GIT_BUFFER_INIT;
+		git_buf post = GIT_BUF_INIT;
 
-		error = git_filter_list_apply_to_data(&post, fl, &pre);
+		error = git_filter_list_apply_to_data(&post, fl, &raw);
 
-		git_buffer_free(&pre);
+		git_buf_free(&raw);
 
 		if (!error)
 			error = git_odb_hash(out, post.ptr, post.size, type);
 
-		git_buffer_free(&post);
+		git_buf_free(&post);
 	}
 
 	return error;