From: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Date: Mon, 21 Nov 2011 18:42:09 +0000 (+0000)
Subject: convert.c: Fix return type of git_path_check_eol()
X-Git-Tag: v1.7.8-rc4~9^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ef563de6dd6997b913d5c87f6caf09db7e44bdcd;p=git.git

convert.c: Fix return type of git_path_check_eol()

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>
---

diff --git a/convert.c b/convert.c
index 038b0be61..86e9c29ec 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;