convert: drop arguments other than 'path' from would_convert_to_git()

sprohaska · gitster · commit 7ce7c7607b14 · 2014-08-21T15:27:20.000-07:00
It is only the path that matters in the decision whether to filter
or not.  Clarify this by making path the only argument of
would_convert_to_git().

Signed-off-by: Steffen Prohaska &lt;prohaska@zib.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/convert.h b/convert.h
@@ -40,10 +40,9 @@ extern int convert_to_working_tree(const char *path, const char *src,
 				   size_t len, struct strbuf *dst);
 extern int renormalize_buffer(const char *path, const char *src, size_t len,
 			      struct strbuf *dst);
-static inline int would_convert_to_git(const char *path, const char *src,
-				       size_t len, enum safe_crlf checksafe)
+static inline int would_convert_to_git(const char *path)
 {
-	return convert_to_git(path, src, len, NULL, checksafe);
+	return convert_to_git(path, NULL, 0, NULL, 0);
 }
 
 /*****************************************************************
diff --git a/sha1_file.c b/sha1_file.c
@@ -3144,7 +3144,7 @@ int index_fd(unsigned char *sha1, int fd, struct stat *st,
 	if (!S_ISREG(st->st_mode))
 		ret = index_pipe(sha1, fd, type, path, flags);
 	else if (size <= big_file_threshold || type != OBJ_BLOB ||
-		 (path && would_convert_to_git(path, NULL, 0, 0)))
+		 (path && would_convert_to_git(path)))
 		ret = index_core(sha1, fd, size, type, path, flags);
 	else
 		ret = index_stream(sha1, fd, size, type, path, flags);

Original file line number	Diff line number	Diff line change
`@@ -40,10 +40,9 @@ extern int convert_to_working_tree(const char path, const char src,`
`40`	`40`	`size_t len, struct strbuf *dst);`
`41`	`41`	`extern int renormalize_buffer(const char path, const char src, size_t len,`
`42`	`42`	`struct strbuf *dst);`
`43`		`-static inline int would_convert_to_git(const char path, const char src,`
`44`		`- size_t len, enum safe_crlf checksafe)`
	`43`	`+static inline int would_convert_to_git(const char *path)`
`45`	`44`	`{`
`46`		`- return convert_to_git(path, src, len, NULL, checksafe);`
	`45`	`+ return convert_to_git(path, NULL, 0, NULL, 0);`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`/*****************************************************************`