summaryrefslogtreecommitdiff
path: root/builtin/check-attr.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-12 05:56:24 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-12 06:07:55 (GMT)
commit94a55e4e9f15dbcd827ae0e6feeb951c66416366 (patch)
tree02bad18de0d34bc3ac569732964ebd7a3c2236f6 /builtin/check-attr.c
parent800531a8668710b5fa02b81360116f508888b58c (diff)
downloadgit-94a55e4e9f15dbcd827ae0e6feeb951c66416366.zip
git-94a55e4e9f15dbcd827ae0e6feeb951c66416366.tar.gz
git-94a55e4e9f15dbcd827ae0e6feeb951c66416366.tar.bz2
check-attr: the name of the character is NUL, not NULL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/check-attr.c')
-rw-r--r--builtin/check-attr.c8
1 files 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...] < <list-of-paths>"),
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);