proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-06-23 09:10:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

repository: Indentation

Browse Source
This commit is contained in:
Vicent Marti 2012-08-02 01:22:51 +02:00
parent e5f495012d
commit 0ac349a9f3
1 changed files with 28 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/repository.c
View File

@ -1076,51 +1076,50 @@ int git_repository_head_tree(git_tree **tree, git_repository *repo)
int git_repository_message(char *buffer, size_t len, git_repository *repo) int git_repository_message(char *buffer, size_t len, git_repository *repo)
{ {
git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT; git_buf buf = GIT_BUF_INIT, path = GIT_BUF_INIT;
struct stat st; struct stat st;
ssize_t size; ssize_t size;
int error; int error;
if (git_buf_joinpath(&path, repo->path_repository, MERGE_MSG_FILE) < 0) if (git_buf_joinpath(&path, repo->path_repository, MERGE_MSG_FILE) < 0)
return -1; return -1;
error = p_stat(git_buf_cstr(&path), &st); error = p_stat(git_buf_cstr(&path), &st);
if (error < 0) { if (error < 0) {
if (errno == ENOENT) if (errno == ENOENT)
error = GIT_ENOTFOUND; error = GIT_ENOTFOUND;
git_buf_free(&path); git_buf_free(&path);
return error; return error;
} }
if (buffer == NULL) { if (buffer == NULL) {
git_buf_free(&path); git_buf_free(&path);
return st.st_size; return st.st_size;
} }
if (git_futils_readbuffer(&buf, git_buf_cstr(&path)) < 0) if (git_futils_readbuffer(&buf, git_buf_cstr(&path)) < 0)
goto on_error; goto on_error;
memcpy(buffer, git_buf_cstr(&buf), len); memcpy(buffer, git_buf_cstr(&buf), len);
size = git_buf_len(&buf); size = git_buf_len(&buf);
git_buf_free(&path); git_buf_free(&path);
git_buf_free(&buf); git_buf_free(&buf);
return size; return size;
on_error: on_error:
git_buf_free(&path); git_buf_free(&path);
return -1; return -1;
} }
int git_repository_message_remove(git_repository *repo) int git_repository_message_remove(git_repository *repo)
{ {
git_buf path = GIT_BUF_INIT; git_buf path = GIT_BUF_INIT;
int error; int error;
if (git_buf_joinpath(&path, repo->path_repository, MERGE_MSG_FILE) < 0) if (git_buf_joinpath(&path, repo->path_repository, MERGE_MSG_FILE) < 0)
return -1; return -1;
error = p_unlink(git_buf_cstr(&path)); error = p_unlink(git_buf_cstr(&path));
git_buf_free(&path); git_buf_free(&path);