Use strchrnul() instead of strchr() plus manual workaround

jherland · spearce · commit 94e02e7f3b05 · 2008-09-29T08:56:26.000-07:00
Also gets rid of a C++ comment.

Signed-off-by: Johan Herland &lt;johan@herland.net&gt;
Signed-off-by: Shawn O. Pearce &lt;spearce@spearce.org&gt;
diff --git a/builtin-for-each-ref.c b/builtin-for-each-ref.c
@@ -320,9 +320,7 @@ static const char *find_wholine(const char *who, int wholen, const char *buf, un
 
 static const char *copy_line(const char *buf)
 {
-	const char *eol = strchr(buf, '\n');
-	if (!eol) // simulate strchrnul()
-		eol = buf + strlen(buf);
+	const char *eol = strchrnul(buf, '\n');
 	return xmemdupz(buf, eol - buf);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -320,9 +320,7 @@ static const char find_wholine(const char who, int wholen, const char *buf, un`
`320`	`320`
`321`	`321`	`static const char copy_line(const char buf)`
`322`	`322`	`{`
`323`		`- const char *eol = strchr(buf, '\n');`
`324`		`- if (!eol) // simulate strchrnul()`
`325`		`- eol = buf + strlen(buf);`
	`323`	`+ const char *eol = strchrnul(buf, '\n');`
`326`	`324`	`return xmemdupz(buf, eol - buf);`
`327`	`325`	`}`
`328`	`326`