undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

strbuf: make strbuf_complete_line more generic

Browse Source 
The strbuf_complete_line function makes sure that a buffer
ends in a newline. But we may want to do this for any
character (e.g., "/" on the end of a path). Let's factor out
a generic version, and keep strbuf_complete_line as a thin
wrapper.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2015-09-24 17:05:43 -04:00 committed by Junio C Hamano
parent bb3788cebb
commit 399ad553ce
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
strbuf.h
View File

@ -491,10 +491,21 @@ extern void strbuf_add_lines(struct strbuf *sb, const char *prefix, const char *
*/ */
extern void strbuf_addstr_xml_quoted(struct strbuf *sb, const char *s); extern void strbuf_addstr_xml_quoted(struct strbuf *sb, const char *s);
/**
* "Complete" the contents of `sb` by ensuring that either it ends with the
* character `term`, or it is empty. This can be used, for example,
* to ensure that text ends with a newline, but without creating an empty
* blank line if there is no content in the first place.
*/
static inline void strbuf_complete(struct strbuf *sb, char term)
{
if (sb->len && sb->buf[sb->len - 1] != term)
strbuf_addch(sb, term);
}
static inline void strbuf_complete_line(struct strbuf *sb) static inline void strbuf_complete_line(struct strbuf *sb)
{ {
if (sb->len && sb->buf[sb->len - 1] != '\n') strbuf_complete(sb, '\n');
strbuf_addch(sb, '\n');
} }
extern int strbuf_branchname(struct strbuf *sb, const char *name); extern int strbuf_branchname(struct strbuf *sb, const char *name);