check-ignore: the name of the character is NUL, not NULL
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 11, 2013 at 23:05 UTC
800531a8668710b5fa02b81360116f508888b58c
1 file changed
+6
-6
builtin/check-ignore.c
+6
-6
@@ -12,7 +12,7 @@ static const char * const check_ignore_usage[] = {
12
NULL
13
};
14
15
-static int null_term_line;
15
+static int nul_term_line;
16
17
static const struct option check_ignore_options[] = {
18
OPT__QUIET(&quiet, N_("suppress progress reporting")),
@@ -20,8 +20,8 @@ static const struct option check_ignore_options[] = {
20
OPT_GROUP(""),
21
OPT_BOOLEAN(0, "stdin", &stdin_paths,
22
N_("read file names from stdin")),
23
- OPT_BOOLEAN('z', NULL, &null_term_line,
24
- N_("input paths are terminated by a null character")),
23
+ OPT_BOOLEAN('z', NULL, &nul_term_line,
24
+ N_("input paths are terminated by a NUL character")),
25
OPT_END()
26
};
27
@@ -29,7 +29,7 @@ static void output_exclude(const char *path, struct exclude *exclude)
29
{
30
char *bang = exclude->flags & EXC_FLAG_NEGATIVE ? "!" : "";
31
char *slash = exclude->flags & EXC_FLAG_MUSTBEDIR ? "/" : "";
32
- if (!null_term_line) {
32
+ if (!nul_term_line) {
33
if (!verbose) {
34
write_name_quoted(path, stdout, '\n');
35
} else {
@@ -111,7 +111,7 @@ static int check_ignore_stdin_paths(const char *prefix)
111
struct strbuf buf, nbuf;
112
char **pathspec = NULL;
113
size_t nr = 0, alloc = 0;
114
- int line_termination = null_term_line ? 0 : '\n';
114
+ int line_termination = nul_term_line ? 0 : '\n';
115
int num_ignored;
116
117
strbuf_init(&buf, 0);
@@ -150,7 +150,7 @@ int cmd_check_ignore(int argc, const char **argv, const char *prefix)
150
if (argc > 0)
151
die(_("cannot specify pathnames with --stdin"));
152
} else {
153
- if (null_term_line)
153
+ if (nul_term_line)
154
die(_("-z only makes sense with --stdin"));
155
if (argc == 0)
156
die(_("no path specified"));