[PATCH] convert.c: Fix return type of git_path_check_eol()

Ramsay Jones· Nov 21, 2011, 18:42 UTC · lore

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>
---
 convert.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

Show changes to convert.c +1 −1

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

-- 
1.7.7

Ramkumar Ramachandra· Nov 22, 2011, 02:03 UTC · re: Ramsay Jones · lore

Re: [PATCH] convert.c: Fix return type of git_path_check_eol()

Hi Ramsay,

Ramsay Jones wrote:

Show 14 quoted lines

> [...]
> diff --git a/convert.c b/convert.c
> index 038b0be..86e9c29 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;
>

Looks good.  Thanks.

-- Ram

patchconvert.c: Fix return type of git_path_check_eol()