pnx/archived
Archived
1
0
Fork 0
Code Activity

strbuf.c: use strbuf_setlen in strbuf_* functions.

Browse source
This commit is contained in:
Henrik Hautakoski 2011-02-05 14:32:48 +01:00
parent 1b3035b249
commit 09b6a37cc4
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/strbuf.c
View file

@ -50,8 +50,7 @@ void strbuf_reduce(strbuf_t *s, size_t len) {
if (len > s->len) if (len > s->len)
len = s->len; len = s->len;
s->len -= len; strbuf_setlen(s, s->len - len);
s->buf[s->len] = '\0';
} }
void strbuf_setlen(strbuf_t *s, size_t len) { void strbuf_setlen(strbuf_t *s, size_t len) {
@ -116,8 +115,7 @@ void strbuf_append(strbuf_t *s, const void *ptr, size_t len) {
strbuf_expand(s, len); strbuf_expand(s, len);
memcpy(s->buf + s->len, ptr, len); memcpy(s->buf + s->len, ptr, len);
s->len += len; strbuf_setlen(s, s->len + len);
s->buf[s->len] = '\0';
} }
void strbuf_appendf(strbuf_t *s, const char *fmt, ...) { void strbuf_appendf(strbuf_t *s, const char *fmt, ...) {
@ -168,18 +166,15 @@ void strbuf_append_repeat(strbuf_t *s, char ch, size_t len) {
strbuf_expand(s, len); strbuf_expand(s, len);
memset(s->buf + s->len, ch, len); memset(s->buf + s->len, ch, len);
s->len += len; strbuf_setlen(s, s->len + len);
s->buf[s->len] = '\0';
} }
void strbuf_rchop(strbuf_t *s, char ch) { void strbuf_rchop(strbuf_t *s, char ch) {
char *n = memrchr(s->buf, ch, s->len); char *n = memrchr(s->buf, ch, s->len);
if (n) { if (n)
*n = '\0'; strbuf_setlen(s, n - s->buf);
s->len = n - s->buf;
}
} }
void strbuf_term(strbuf_t *s, char ch) { void strbuf_term(strbuf_t *s, char ch) {