convert: don't mix enum with int
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ramkumar Ramachandra committed
Nov 15, 2011 at 22:29 UTC
7356b51e4bd07893256d76468d301dc244f4299d
1 file changed
+3
-3
convert.c
+3
-3
@@ -641,7 +641,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
641
return 1;
642
}
643
644
-static int git_path_check_crlf(const char *path, struct git_attr_check *check)
644
+static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_check *check)
645
{
646
const char *value = check->value;
647
@@ -658,7 +658,7 @@ static int git_path_check_crlf(const char *path, struct git_attr_check *check)
658
return CRLF_GUESS;
659
}
660
661
-static int git_path_check_eol(const char *path, struct git_attr_check *check)
661
+static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
662
{
663
const char *value = check->value;
664
@@ -811,7 +811,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
811
src = dst->buf;
812
len = dst->len;
813
}
814
- return ret | convert_to_git(path, src, len, dst, 0);
814
+ return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE);
815
}
816
817
/*****************************************************************