cryb.to/cryb-to
1
0
Fork 0
mirror of https://github.com/cryb-to/cryb-to.git synced 2024-12-18 18:44:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Don't call string_expand() unless we know that we need to.

Browse source
This commit is contained in:
Dag-Erling Smørgrav 2016-09-17 23:42:09 +02:00
parent d0236914f7
commit 21cd8118fa
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/core/cryb_string_impl.c
View file

@ -236,7 +236,8 @@ string_append_c(string *str, char_t ch)
{ {
ssize_t ret; ssize_t ret;
if ((ret = string_expand(str, str->len + 1)) < 0) if (L2S(str->len + 1) > str->size &&
(ret = string_expand(str, str->len + 1)) < 0)
return (ret); return (ret);
str->buf[str->len++] = ch; str->buf[str->len++] = ch;
str->buf[str->len] = 0; str->buf[str->len] = 0;
@ -252,7 +253,8 @@ string_append_cs(string *str, const char_t *cs, size_t len)
ssize_t ret; ssize_t ret;
while (*cs && len--) { while (*cs && len--) {
if ((ret = string_expand(str, str->len + 1)) < 0) if (L2S(str->len + 1) > str->size &&
(ret = string_expand(str, str->len + 1)) < 0)
return (ret); return (ret);
str->buf[str->len++] = *cs++; str->buf[str->len++] = *cs++;
str->buf[str->len] = 0; str->buf[str->len] = 0;
@ -270,7 +272,8 @@ string_append_string(string *str, const string *other, size_t len)
if (len > other->len) if (len > other->len)
len = other->len; len = other->len;
if ((ret = string_expand(str, str->len + len)) < 0) if (L2S(str->len + len) > str->size &&
(ret = string_expand(str, str->len + len)) < 0)
return (ret); return (ret);
memcpy(str->buf + str->len, other->buf, len * sizeof(char_t)); memcpy(str->buf + str->len, other->buf, len * sizeof(char_t));
str->len += len; str->len += len;
@ -315,7 +318,8 @@ string_vprintf(string *str, const char_t *fmt, va_list ap)
if (len < res) if (len < res)
break; break;
str->buf[str->len] = 0; str->buf[str->len] = 0;
if ((ret = string_expand(str, str->len + len)) < 0) if (L2S(str->len + len) > str->size &&
(ret = string_expand(str, str->len + len)) < 0)
return (ret); return (ret);
} }
str->len += len; str->len += len;