proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-29 06:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

filebuf: Reword errors

Browse Source
This commit is contained in:
Vicent Marti 2011-05-23 21:00:19 +03:00
parent 374db5f912
commit f6328611dc
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/filebuf.c
View File

@ -179,7 +179,7 @@ int git_filebuf_open(git_filebuf *file, const char *path, int flags)
/* Initialize the ZLib stream */ /* Initialize the ZLib stream */
if (deflateInit(&file->zs, Z_BEST_SPEED) != Z_OK) { if (deflateInit(&file->zs, Z_BEST_SPEED) != Z_OK) {
error = GIT_EZLIB; error = git__throw(GIT_EZLIB, "Failed to initialize zlib");
goto cleanup; goto cleanup;
} }
@ -245,15 +245,14 @@ int git_filebuf_open(git_filebuf *file, const char *path, int flags)
cleanup: cleanup:
git_filebuf_cleanup(file); git_filebuf_cleanup(file);
return git__rethrow(error, "Failed to open file"); return git__rethrow(error, "Failed to open file buffer for '%s'", path);
} }
int git_filebuf_hash(git_oid *oid, git_filebuf *file) int git_filebuf_hash(git_oid *oid, git_filebuf *file)
{ {
int error; int error;
if (file->digest == NULL) assert(oid && file && file->digest);
return git__throw(GIT_ERROR, "Failed to get hash for file. File has no digest");
if ((error = flush_buffer(file)) < GIT_SUCCESS) if ((error = flush_buffer(file)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to get hash for file"); return git__rethrow(error, "Failed to get hash for file");
@ -279,9 +278,8 @@ int git_filebuf_commit(git_filebuf *file)
{ {
int error; int error;
/* tmp file cannot be commited */ /* temporary files cannot be committed */
if (file->path_original == NULL) assert(file && file->path_original);
return git__throw(GIT_EOSERR, "Failed to commit from buffer. File path does not exist");
file->flush_mode = Z_FINISH; file->flush_mode = Z_FINISH;
if ((error = flush_buffer(file)) < GIT_SUCCESS) if ((error = flush_buffer(file)) < GIT_SUCCESS)
@ -295,8 +293,8 @@ int git_filebuf_commit(git_filebuf *file)
cleanup: cleanup:
git_filebuf_cleanup(file); git_filebuf_cleanup(file);
if (error < GIT_SUCCESS) if (error < GIT_SUCCESS)
return git__rethrow(error, "Failed to commit from buffer"); return git__rethrow(error, "Failed to commit locked file from buffer");
return error; return GIT_SUCCESS;
} }
GIT_INLINE(void) add_to_cache(git_filebuf *file, const void *buf, size_t len) GIT_INLINE(void) add_to_cache(git_filebuf *file, const void *buf, size_t len)
@ -372,7 +370,7 @@ int git_filebuf_printf(git_filebuf *file, const char *format, ...)
if (len < 0 || (size_t)len >= space_left) { if (len < 0 || (size_t)len >= space_left) {
if ((error = flush_buffer(file)) < GIT_SUCCESS) if ((error = flush_buffer(file)) < GIT_SUCCESS)
return git__rethrow(error, "Failed to print to buffer"); return git__rethrow(error, "Failed to output to buffer");
len = vsnprintf((char *)file->buffer + file->buf_pos, space_left, format, arglist); len = vsnprintf((char *)file->buffer + file->buf_pos, space_left, format, arglist);
if (len < 0 || (size_t)len > file->buf_size) if (len < 0 || (size_t)len > file->buf_size)