mirror of
https://github.com/git/git
synced 2024-08-28 12:09:19 +00:00
convert: don't mix enum with int
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
620771c83e
commit
7356b51e4b
|
@ -641,7 +641,7 @@ static int ident_to_worktree(const char *path, const char *src, size_t len,
|
|||
return 1;
|
||||
}
|
||||
|
||||
static int git_path_check_crlf(const char *path, struct git_attr_check *check)
|
||||
static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_check *check)
|
||||
{
|
||||
const char *value = check->value;
|
||||
|
||||
|
@ -658,7 +658,7 @@ static int git_path_check_crlf(const char *path, struct git_attr_check *check)
|
|||
return CRLF_GUESS;
|
||||
}
|
||||
|
||||
static int git_path_check_eol(const char *path, struct git_attr_check *check)
|
||||
static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
|
||||
{
|
||||
const char *value = check->value;
|
||||
|
||||
|
@ -811,7 +811,7 @@ int renormalize_buffer(const char *path, const char *src, size_t len, struct str
|
|||
src = dst->buf;
|
||||
len = dst->len;
|
||||
}
|
||||
return ret | convert_to_git(path, src, len, dst, 0);
|
||||
return ret | convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE);
|
||||
}
|
||||
|
||||
/*****************************************************************
|
||||
|
|
Loading…
Reference in a new issue