check-attr: there are only two possible line terminations
The program by default reads LF terminated lines, with an option to use NUL terminated records. Instead of pretending that there can be other useful values for line_termination, use a boolean variable, nul_term_line, to tell if NUL terminated records are used, and switch between strbuf_getline_{lf,nul} based on it. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jan 14, 2016 at 13:26 UTC
f418afa98afb15afb8f93fe1ab11d5b83266d17d
1 file changed
+4
-3
builtin/check-attr.c
+4
-3
@@ -73,12 +73,13 @@ static void check_attr_stdin_paths(const char *prefix, int cnt,
73
struct git_attr_check *check)
74
{
75
struct strbuf buf, nbuf;
76
- int line_termination = nul_term_line ? 0 : '\n';
76
+ strbuf_getline_fn getline_fn;
77
78
+ getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;
79
strbuf_init(&buf, 0);
80
strbuf_init(&nbuf, 0);
80
- while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
81
- if (line_termination && buf.buf[0] == '"') {
81
+ while (getline_fn(&buf, stdin) != EOF) {
82
+ if (!nul_term_line && buf.buf[0] == '"') {
83
strbuf_reset(&nbuf);
84
if (unquote_c_style(&nbuf, buf.buf, NULL))
85
die("line is badly quoted");