From: Junio C Hamano Date: Fri, 12 Jul 2013 06:18:45 GMT Subject: [PATCH 2/4] check-attr: the name of the character is NUL, not NULL Message-ID: <1373609927-3244-3-git-send-email-gitster@pobox.com> In-Reply-To: <1373609927-3244-1-git-send-email-gitster@pobox.com> Signed-off-by: Junio C Hamano --- builtin/check-attr.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/check-attr.c b/builtin/check-attr.c index 075d01d..7cc9b5d 100644 --- a/builtin/check-attr.c +++ b/builtin/check-attr.c @@ -13,14 +13,14 @@ N_("git check-attr --stdin [-z] [-a | --all | attr...] < "), NULL }; -static int null_term_line; +static int nul_term_line; static const struct option check_attr_options[] = { OPT_BOOLEAN('a', "all", &all_attrs, N_("report all attributes set on file")), OPT_BOOLEAN(0, "cached", &cached_attrs, N_("use .gitattributes only from the index")), OPT_BOOLEAN(0 , "stdin", &stdin_paths, N_("read file names from stdin")), - OPT_BOOLEAN('z', NULL, &null_term_line, - N_("input paths are terminated by a null character")), + OPT_BOOLEAN('z', NULL, &nul_term_line, + N_("input paths are terminated by a NUL character")), OPT_END() }; @@ -65,7 +65,7 @@ static void check_attr_stdin_paths(const char *prefix, int cnt, struct git_attr_check *check) { struct strbuf buf, nbuf; - int line_termination = null_term_line ? 0 : '\n'; + int line_termination = nul_term_line ? 0 : '\n'; strbuf_init(&buf, 0); strbuf_init(&nbuf, 0); -- 1.8.3.2-911-g2c4daa5