kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

strbuf: use _rtrim and _ltrim in strbuf_trim 

strbuf_trim() strips whitespace from the end, then the beginning of
a strbuf.  Those operations are duplicated in strbuf_rtrim() and
strbuf_ltrim().

Replace strbuf_trim() implementation with calls to strbuf_rtrim(),
then strbuf_ltrim().

Signed-off-by: Brian Gesiak <modocache@gmail.com>
Reviewed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Brian Gesiak 2014-04-30 17:58:06 +09:00 committed by Junio C Hamano
parent d8779e1e25
commit 3bb55e8aa8
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
strbuf.c
View File

@ -78,15 +78,8 @@ void strbuf_grow(struct strbuf *sb, size_t extra)


void strbuf_trim(struct strbuf *sb) void strbuf_trim(struct strbuf *sb)
{ {
char *b = sb->buf; strbuf_rtrim(sb);
while (sb->len > 0 && isspace((unsigned char)sb->buf[sb->len - 1])) strbuf_ltrim(sb);
sb->len--;
while (sb->len > 0 && isspace(*b)) {
b++;
sb->len--;
}
memmove(sb->buf, b, sb->len);
sb->buf[sb->len] = '\0';
} }
void strbuf_rtrim(struct strbuf *sb) void strbuf_rtrim(struct strbuf *sb)
{ {