aboutsummaryrefslogtreecommitdiff
path: root/src/sbuf.c
diff options
context:
space:
mode:
authorOnur Gündüz <ogunduz@gmail.com>2026-06-17 00:39:56 +0200
committerOnur Gündüz <ogunduz@gmail.com>2026-06-17 00:39:56 +0200
commit4018dc4777260714d68c1927296277352255454e (patch)
treedc9ac4a7cc982c535932ca74090674140a91ab91 /src/sbuf.c
parente355ba215358146a2ca3db5d3a33e614f0b1347f (diff)
downloadffwd-4018dc4777260714d68c1927296277352255454e.tar.gz
ffwd-4018dc4777260714d68c1927296277352255454e.zip
server: speed up sbuf_putc and common-case sbuf_printf
Diffstat (limited to 'src/sbuf.c')
-rw-r--r--src/sbuf.c37
1 files changed, 24 insertions, 13 deletions
diff --git a/src/sbuf.c b/src/sbuf.c
index 1f929b9..f286d8c 100644
--- a/src/sbuf.c
+++ b/src/sbuf.c
@@ -32,7 +32,12 @@ void sbuf_append(sbuf *b, const void *p, size_t n) {
b->ptr[b->len] = '\0';
}
-void sbuf_putc(sbuf *b, char c) { sbuf_append(b, &c, 1); }
+void sbuf_putc(sbuf *b, char c) {
+ sbuf_reserve(b, 1);
+ b->ptr[b->len++] = c;
+ b->ptr[b->len] = '\0';
+}
+
void sbuf_puts(sbuf *b, const char *s) { sbuf_append(b, s, strlen(s)); }
void sbuf_clear(sbuf *b) {
@@ -42,19 +47,25 @@ void sbuf_clear(sbuf *b) {
}
void sbuf_printf(sbuf *b, const char *fmt, ...) {
- va_list ap, ap2;
+ va_list ap;
va_start(ap, fmt);
- va_copy(ap2, ap);
- int n = vsnprintf(NULL, 0, fmt, ap);
- va_end(ap);
- if (n < 0)
- die_oom();
- sbuf_reserve(b, (size_t)n);
- int n2 = vsnprintf(b->ptr + b->len, b->cap - b->len, fmt, ap2);
- va_end(ap2);
- if (n2 < 0 || n2 != n)
- die_oom();
- b->len += (size_t)n;
+ for (;;) {
+ size_t avail = b->cap > b->len ? b->cap - b->len : 0;
+ va_list aq;
+ va_copy(aq, ap);
+ int n = vsnprintf(avail ? b->ptr + b->len : NULL, avail, fmt, aq);
+ va_end(aq);
+ if (n < 0) {
+ va_end(ap);
+ die_oom();
+ }
+ if ((size_t)n < avail) {
+ b->len += (size_t)n;
+ va_end(ap);
+ return;
+ }
+ sbuf_reserve(b, (size_t)n);
+ }
}
void sbuf_free(sbuf *b) {