[PATCH v2 1/4] convert: always initialize attr_action in convert_attrs
- From
- Martin Ågren <martin.agren@gmail.com>
- Date
- Aug 21, 2017, 17:43 UTC
- Message-ID
- <f23f7f3d6cb75743cfd5b120a87e8765b281ce0a.1503323391.git.martin.agren@gmail.com>
- In-Reply-To
- <cover.1503323390.git.martin.agren@gmail.com>
convert_attrs contains an "if-else". In the "if", we set attr_action twice, and the first assignment has no effect. In the "else", we do not set it at all. Since git_check_attr always returns the same value, we'll always end up in the "if", so there is no problem right now. But convert_attrs is obviously trying not to rely on such an implementation-detail of another component.
Make the initialization of attr_action after the if-else. Remove the earlier assignments.
Suggested-by: Torsten Bögershausen <tboegi@web.de> Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- v2: adapted per input from Torsten
convert.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/convert.c b/convert.c index 1012462e3..1f8116381 100644 --- a/convert.c +++ b/convert.c @@ -1040,7 +1040,6 @@ static void convert_attrs(struct conv_attrs *ca, const char *path) ca->crlf_action = git_path_check_crlf(ccheck + 4); if (ca->crlf_action == CRLF_UNDEFINED) ca->crlf_action = git_path_check_crlf(ccheck + 0); - ca->attr_action = ca->crlf_action; ca->ident = git_path_check_ident(ccheck + 1); ca->drv = git_path_check_convert(ccheck + 2); if (ca->crlf_action != CRLF_BINARY) { @@ -1054,12 +1053,14 @@ static void convert_attrs(struct conv_attrs *ca, const char *path) else if (eol_attr == EOL_CRLF) ca->crlf_action = CRLF_TEXT_CRLF; } - ca->attr_action = ca->crlf_action; } else { ca->drv = NULL; ca->crlf_action = CRLF_UNDEFINED; ca->ident = 0; } + + /* Save attr and make a decision for action */ + ca->attr_action = ca->crlf_action; if (ca->crlf_action == CRLF_TEXT) ca->crlf_action = text_eol_is_crlf() ? CRLF_TEXT_CRLF : CRLF_TEXT_INPUT; if (ca->crlf_action == CRLF_UNDEFINED && auto_crlf == AUTO_CRLF_FALSE)
-- 2.14.1.151.gdfeca7a7e