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

branch: refactor git_branch_remote_name

Browse Source 
Return the size we'd need to write to instead of simply an
error. Split the function into two to be used later by the upstream
configuration functions.
This commit is contained in:
Carlos Martín Nieto 2013-03-30 09:30:29 +01:00
parent a258d8e357
commit 97016f29ab
2 changed files with 23 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/branch.c
View File

@ -305,23 +305,16 @@ cleanup:
return error; return error;
} }
int git_branch_remote_name( static int remote_name(git_buf *buf, git_repository *repo, const char *canonical_branch_name)
char *remote_name_out,
size_t buffer_size,
git_repository *repo,
const char *canonical_branch_name)
{ {
git_strarray remote_list = {0}; git_strarray remote_list = {0};
size_t i, remote_name_size; size_t i;
git_remote *remote; git_remote *remote;
const git_refspec *fetchspec; const git_refspec *fetchspec;
int error = 0; int error = 0;
char *remote_name = NULL; char *remote_name = NULL;
assert(repo && canonical_branch_name); assert(buf && repo && canonical_branch_name);
if (remote_name_out && buffer_size)
*remote_name_out = '\0';
/* Verify that this is a remote branch */ /* Verify that this is a remote branch */
if (!git_reference__is_remote(canonical_branch_name)) { if (!git_reference__is_remote(canonical_branch_name)) {
@ -362,23 +355,10 @@ int git_branch_remote_name(
} }
if (remote_name) { if (remote_name) {
remote_name_size = strlen(remote_name) + 1; git_buf_clear(buf);
error = (int) remote_name_size; error = git_buf_puts(buf, remote_name);
if (remote_name_out) {
if(remote_name_size > buffer_size) {
giterr_set(
GITERR_INVALID,
"Buffer too short to hold the remote name.");
error = GIT_ERROR;
goto cleanup;
}
memcpy(remote_name_out, remote_name, remote_name_size);
}
} else { } else {
error = GIT_ENOTFOUND; error = GIT_ENOTFOUND;
goto cleanup;
} }
cleanup: cleanup:
@ -386,6 +366,23 @@ cleanup:
return error; return error;
} }
int git_branch_remote_name(char *buffer, size_t buffer_len, git_repository *repo, const char *refname)
{
int ret;
git_buf buf = GIT_BUF_INIT;
if ((ret = remote_name(&buf, repo, refname)) < 0)
return ret;
if (buffer)
git_buf_copy_cstr(buffer, buffer_len, &buf);
ret = git_buf_len(&buf) + 1;
git_buf_free(&buf);
return ret;
}
int git_branch_upstream_name( int git_branch_upstream_name(
char *tracking_branch_name_out, char *tracking_branch_name_out,
size_t buffer_size, size_t buffer_size,

2
tests-clar/refs/branches/remote.c
View File

@ -42,7 +42,7 @@ void test_refs_branches_remote__insufficient_buffer_returns_error(void)
cl_git_fail_with(git_branch_remote_name(remotename, cl_git_fail_with(git_branch_remote_name(remotename,
expected_remote_name_length - 1, g_repo, remote_tracking_branch_name), expected_remote_name_length - 1, g_repo, remote_tracking_branch_name),
GIT_ERROR); expected_remote_name_length);
} }
void test_refs_branches_remote__no_matching_remote_returns_error(void) void test_refs_branches_remote__no_matching_remote_returns_error(void)