convert: don't mix enum with int

artagnon · gitster · commit 7356b51e4bd0 · 2011-11-15T16:09:02.000-08:00
Signed-off-by: Ramkumar Ramachandra &lt;artagnon@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/convert.c b/convert.c
@@ -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;
 
@@ -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;
 
@@ -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);
 }
 
 /*****************************************************************

Original file line number	Diff line number	Diff line change
`@@ -641,7 +641,7 @@ static int ident_to_worktree(const char path, const char src, size_t len,`
`641`	`641`	`return 1;`
`642`	`642`	`}`
`643`	`643`
`644`		`-static int git_path_check_crlf(const char path, struct git_attr_check check)`
	`644`	`+static enum crlf_action git_path_check_crlf(const char path, struct git_attr_check check)`
`645`	`645`	`{`
`646`	`646`	`const char *value = check->value;`
`647`	`647`
`@@ -658,7 +658,7 @@ static int git_path_check_crlf(const char path, struct git_attr_check check)`
`658`	`658`	`return CRLF_GUESS;`
`659`	`659`	`}`
`660`	`660`
`661`		`-static int git_path_check_eol(const char path, struct git_attr_check check)`
	`661`	`+static enum crlf_action git_path_check_eol(const char path, struct git_attr_check check)`
`662`	`662`	`{`
`663`	`663`	`const char *value = check->value;`
`664`	`664`
`@@ -811,7 +811,7 @@ int renormalize_buffer(const char path, const char src, size_t len, struct str`
`811`	`811`	`src = dst->buf;`
`812`	`812`	`len = dst->len;`
`813`	`813`	`}`
`814`		`- return ret \| convert_to_git(path, src, len, dst, 0);`
	`814`	`+ return ret \| convert_to_git(path, src, len, dst, SAFE_CRLF_FALSE);`
`815`	`815`	`}`
`816`	`816`
`817`	`817`	`/*****************************************************************`