From: Elijah Newren Date: Wed, 08 Jun 2011 07:30:48 GMT Subject: [PATCH 18/48] merge-recursive: Mark some diff_filespec struct arguments const Message-ID: <1307518278-23814-19-git-send-email-newren@gmail.com> In-Reply-To: <1307518278-23814-1-git-send-email-newren@gmail.com> Signed-off-by: Elijah Newren --- merge-recursive.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 3d464d9..317bf23 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -461,9 +461,10 @@ static struct string_list *get_renames(struct merge_options *o, return renames; } -static int update_stages_options(const char *path, struct diff_filespec *o, - struct diff_filespec *a, struct diff_filespec *b, - int clear, int options) +static int update_stages_options(const char *path, const struct diff_filespec *o, + const struct diff_filespec *a, + const struct diff_filespec *b, + int clear, int options) { if (clear) if (remove_file_from_cache(path)) @@ -712,9 +713,9 @@ struct merge_file_info { static int merge_3way(struct merge_options *o, mmbuffer_t *result_buf, - struct diff_filespec *one, - struct diff_filespec *a, - struct diff_filespec *b, + const struct diff_filespec *one, + const struct diff_filespec *a, + const struct diff_filespec *b, const char *branch1, const char *branch2) { @@ -772,9 +773,9 @@ static int merge_3way(struct merge_options *o, } static struct merge_file_info merge_file(struct merge_options *o, - struct diff_filespec *one, - struct diff_filespec *a, - struct diff_filespec *b, + const struct diff_filespec *one, + const struct diff_filespec *a, + const struct diff_filespec *b, const char *branch1, const char *branch2) { -- 1.7.6.rc0.62.g2d69f