mirror of
https://github.com/git/git.git
synced 2026-01-09 17:46:37 +00:00
strbuf: accept a comment string for strbuf_stripspace()
As part of our transition to multi-byte comment characters, let's take a NUL-terminated string pointer for strbuf_stripspace(), rather than a single character. We can continue to support its feature of ignoring comments by accepting a NULL pointer (as opposed to the current behavior of a NUL byte). All of the callers have to be adjusted, but they can all just pass comment_line_str (or NULL). Inside the function we detect comments by comparing the first byte of a line to the comment character. We'll adjust that to use starts_with(), which will match multiple bytes (though for now, of course, we still only allow a single byte, so it's academic). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
committed by
Junio C Hamano
parent
72a7d5d97f
commit
2982b65690
@@ -59,7 +59,7 @@ int cmd_stripspace(int argc, const char **argv, const char *prefix)
|
||||
|
||||
if (mode == STRIP_DEFAULT || mode == STRIP_COMMENTS)
|
||||
strbuf_stripspace(&buf,
|
||||
mode == STRIP_COMMENTS ? comment_line_char : '\0');
|
||||
mode == STRIP_COMMENTS ? comment_line_str : NULL);
|
||||
else
|
||||
comment_lines(&buf);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user