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

merge_driver: fix const-correctness for source getters

Browse Source
This commit is contained in:
Patrick Steinhardt 2017-03-15 11:46:15 +01:00
parent 8051b47f5b
commit bb342159d8
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/git2/sys/merge.h
View File

@ -36,23 +36,23 @@ GIT_EXTERN(git_merge_driver *) git_merge_driver_lookup(const char *name);
typedef struct git_merge_driver_source git_merge_driver_source;
/** Get the repository that the source data is coming from. */
GIT_EXTERN(git_repository *) git_merge_driver_source_repo(
GIT_EXTERN(const git_repository *) git_merge_driver_source_repo(
const git_merge_driver_source *src);
/** Gets the ancestor of the file to merge. */
GIT_EXTERN(git_index_entry *) git_merge_driver_source_ancestor(
GIT_EXTERN(const git_index_entry *) git_merge_driver_source_ancestor(
const git_merge_driver_source *src);
/** Gets the ours side of the file to merge. */
GIT_EXTERN(git_index_entry *) git_merge_driver_source_ours(
GIT_EXTERN(const git_index_entry *) git_merge_driver_source_ours(
const git_merge_driver_source *src);
/** Gets the theirs side of the file to merge. */
GIT_EXTERN(git_index_entry *) git_merge_driver_source_theirs(
GIT_EXTERN(const git_index_entry *) git_merge_driver_source_theirs(
const git_merge_driver_source *src);
/** Gets the merge file options that the merge was invoked with */
GIT_EXTERN(git_merge_file_options *) git_merge_driver_source_file_options(
GIT_EXTERN(const git_merge_file_options *) git_merge_driver_source_file_options(
const git_merge_driver_source *src);

10
src/merge_driver.c
View File

@ -32,31 +32,31 @@ static struct merge_driver_registry merge_driver_registry;
static void git_merge_driver_global_shutdown(void);
git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src)
const git_repository* git_merge_driver_source_repo(const git_merge_driver_source *src)
{
assert(src);
return src->repo;
}
git_index_entry* git_merge_driver_source_ancestor(const git_merge_driver_source *src)
const git_index_entry* git_merge_driver_source_ancestor(const git_merge_driver_source *src)
{
assert(src);
return src->ancestor;
}
git_index_entry* git_merge_driver_source_ours(const git_merge_driver_source *src)
const git_index_entry* git_merge_driver_source_ours(const git_merge_driver_source *src)
{
assert(src);
return src->ours;
}
git_index_entry* git_merge_driver_source_theirs(const git_merge_driver_source *src)
const git_index_entry* git_merge_driver_source_theirs(const git_merge_driver_source *src)
{
assert(src);
return src->theirs;
}
git_merge_file_options* git_merge_driver_source_file_options(const git_merge_driver_source *src)
const git_merge_file_options* git_merge_driver_source_file_options(const git_merge_driver_source *src)
{
assert(src);
return src->file_opts;