convert.c: Fix return type of git_path_check_eol()

Ramsay Jones · gitster · commit ef563de6dd69 · 2011-11-21T11:00:57.000-08:00
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 &lt;ramsay@ramsay1.demon.co.uk&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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;
 

Original file line number	Diff line number	Diff line change
`@@ -658,7 +658,7 @@ static enum crlf_action git_path_check_crlf(const char *path, struct git_attr_ch`
`658`	`658`	`return CRLF_GUESS;`
`659`	`659`	`}`
`660`	`660`
`661`		`-static enum crlf_action git_path_check_eol(const char path, struct git_attr_check check)`
	`661`	`+static enum eol git_path_check_eol(const char path, struct git_attr_check check)`
`662`	`662`	`{`
`663`	`663`	`const char *value = check->value;`
`664`	`664`