diff options
| author | Vicent Martà <tanoku@gmail.com> | 2012-02-27 04:28:31 +0100 |
|---|---|---|
| committer | Vicent Martà <tanoku@gmail.com> | 2012-02-27 05:30:07 +0100 |
| commit | 13224ea4aad9a1b3c9cc4c992ceaea9af623e047 (patch) | |
| tree | b5c3a503d1ef7ba6269bf4291530c4e8e5936bdb /src/reflog.c | |
| parent | e07c2d225deec42e592133df49ad8c564d4d66c7 (diff) | |
| download | libgit2-13224ea4aad9a1b3c9cc4c992ceaea9af623e047.tar.gz | |
buffer: Unify `git_fbuffer` and `git_buf`
This makes so much sense that I can't believe it hasn't been done
before. Kill the old `git_fbuffer` and read files straight into
`git_buf` objects.
Also: In order to fully support 4GB files in 32-bit systems, the
`git_buf` implementation has been changed from using `ssize_t` for
storage and storing negative values on allocation failure, to using
`size_t` and changing the buffer pointer to a magical pointer on
allocation failure.
Hopefully this won't break anything.
Diffstat (limited to 'src/reflog.c')
| -rw-r--r-- | src/reflog.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/reflog.c b/src/reflog.c index 9f5ccd322..6ca9418cf 100644 --- a/src/reflog.c +++ b/src/reflog.c @@ -183,7 +183,7 @@ int git_reflog_read(git_reflog **reflog, git_reference *ref) { int error; git_buf log_path = GIT_BUF_INIT; - git_fbuffer log_file = GIT_FBUFFER_INIT; + git_buf log_file = GIT_BUF_INIT; git_reflog *log = NULL; *reflog = NULL; @@ -201,7 +201,7 @@ int git_reflog_read(git_reflog **reflog, git_reference *ref) goto cleanup; } - if ((error = reflog_parse(log, log_file.data, log_file.len)) < GIT_SUCCESS) + if ((error = reflog_parse(log, log_file.ptr, log_file.size)) < GIT_SUCCESS) git__rethrow(error, "Failed to read reflog"); else *reflog = log; @@ -209,7 +209,7 @@ int git_reflog_read(git_reflog **reflog, git_reference *ref) cleanup: if (error != GIT_SUCCESS && log != NULL) git_reflog_free(log); - git_futils_freebuffer(&log_file); + git_buf_free(&log_file); git_buf_free(&log_path); return error; |