summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRamsay Jones <ramsay@ramsay1.demon.co.uk>2011-11-21 18:42:09 +0000
committerJunio C Hamano <gitster@pobox.com>2011-11-21 11:00:57 -0800
commitef563de6dd6997b913d5c87f6caf09db7e44bdcd (patch)
tree9bc482632e8148fbc850dc03bf4784659094a28c
parente4ac953b2a1e33fedf210ac59394db480a6ade33 (diff)
downloadgit-ef563de6dd6997b913d5c87f6caf09db7e44bdcd.tar.gz
convert.c: Fix return type of git_path_check_eol()rr/misc-fixes
The git_path_check_eol() function converts a string value to the corresponding 'enum eol' value. However, the function is currently declared to return an 'enum crlf_action', which causes sparse to complain thus: SP convert.c convert.c:736:50: warning: mixing different enum types convert.c:736:50: int enum crlf_action versus convert.c:736:50: int enum eol In order to suppress the warning, we simply correct the return type in the function declaration. Signed-off-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--convert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/convert.c b/convert.c
index 038b0be617..86e9c29ec0 100644
--- a/convert.c
+++ b/convert.c
@@ -658,7 +658,7 @@ static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_ch
return CRLF_GUESS;
}
-static enum crlf_action git_path_check_eol(const char *path, struct git_attr_check *check)
+static enum eol git_path_check_eol(const char *path, struct git_attr_check *check)
{
const char *value = check->value;