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

Merge branch 'bg/strbuf-trim'

Browse Source 
* bg/strbuf-trim:
  api-strbuf.txt: add docs for _trim and _ltrim
  strbuf: use _rtrim and _ltrim in strbuf_trim
This commit is contained in:
Junio C Hamano 2014-06-03 12:06:46 -07:00
commit d6850db3c2
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/technical/api-strbuf.txt
View File

@ -121,10 +121,19 @@ Functions
* Related to the contents of the buffer
`strbuf_trim`::
Strip whitespace from the beginning and end of a string.
Equivalent to performing `strbuf_rtrim()` followed by `strbuf_ltrim()`.
`strbuf_rtrim`::
Strip whitespace from the end of a string.
`strbuf_ltrim`::
Strip whitespace from the beginning of a string.
`strbuf_cmp`::
Compare two buffers. Returns an integer less than, equal to, or greater

11
strbuf.c
View File

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