Skip to content

Commit

Permalink
convert: don't mix enum with int
Browse files Browse the repository at this point in the history
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Ramkumar Ramachandra authored and Junio C Hamano committed Nov 16, 2011
1 parent 620771c commit 7356b51
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions convert.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;

Expand Down Expand Up @@ -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);
}

/*****************************************************************
Expand Down

0 comments on commit 7356b51

Please sign in to comment.