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>

diff --git a/builtin/check-attr.c b/builtin/check-attr.c
index 265c9ba02264d29eb3f63f1a8264c9fe7e642332..087325ef6954e4a2364d194f8d7ac27fedb7fc67 100644 (file)
--- a/builtin/check-attr.c
+++ b/builtin/check-attr.c
@@ -73,12 +73,13 @@ static void check_attr_stdin_paths(const char *prefix, int cnt,
        struct git_attr_check *check)
 {
        struct strbuf buf, nbuf;
        struct git_attr_check *check)
 {
        struct strbuf buf, nbuf;

-       int line_termination = nul_term_line ? 0 : '\n';
+       strbuf_getline_fn getline_fn;

 
 

+       getline_fn = nul_term_line ? strbuf_getline_nul : strbuf_getline_lf;

        strbuf_init(&buf, 0);
        strbuf_init(&nbuf, 0);
        strbuf_init(&buf, 0);
        strbuf_init(&nbuf, 0);

-       while (strbuf_getline(&buf, stdin, line_termination) != EOF) {
-               if (line_termination && buf.buf[0] == '"') {
+       while (getline_fn(&buf, stdin) != EOF) {
+               if (!nul_term_line && buf.buf[0] == '"') {

                        strbuf_reset(&nbuf);
                        if (unquote_c_style(&nbuf, buf.buf, NULL))
                                die("line is badly quoted");
                        strbuf_reset(&nbuf);
                        if (unquote_c_style(&nbuf, buf.buf, NULL))
                                die("line is badly quoted");