From bb342159d83a697461c23b0abfe9bc8e563d7346 Mon Sep 17 00:00:00 2001 From: Patrick Steinhardt Date: Wed, 15 Mar 2017 11:46:15 +0100 Subject: merge_driver: fix const-correctness for source getters --- src/merge_driver.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/merge_driver.c') diff --git a/src/merge_driver.c b/src/merge_driver.c index 5ee0b38b5..0f35d23c2 100644 --- a/src/merge_driver.c +++ b/src/merge_driver.c @@ -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; -- cgit v1.2.1