Refactor epoll module.

[apps/pfixtools.git] / buffer.c

diff --git a/buffer.c b/buffer.c
index 4e41b3c..847f202 100644 (file)
--- a/buffer.c
+++ b/buffer.c
@@ -37,20 +37,40 @@
 #include <stdio.h>
 #include <unistd.h>
 
+#include "mem.h"
 #include "buffer.h"
 
 #define BUFSIZ_INCREMENT  256
 
 void buffer_resize(buffer_t *buf, ssize_t newsize)
 {
-    if (newsize >= buf->size) {
-        /* rounds newsize to the 1024 multiple just after newsize+1 */
-        newsize = (newsize + BUFSIZ_INCREMENT) & ~(BUFSIZ_INCREMENT - 1);
-        p_realloc(&buf->data, newsize);
+    p_allocgrow(&buf->data, newsize + 1, &buf->size);
+}
+
+ssize_t buffer_addvf(buffer_t *buf, const char *fmt, va_list ap)
+{
+    ssize_t pos;
+    int len, available;
+    va_list ap2;
+
+    va_copy(ap2, ap);
+
+    pos = buf->len;
+    available = buf->size - pos;
+
+    len = vsnprintf(buf->data + pos, available, fmt, ap);
+    if (len >= available) {
+        buffer_resize(buf, buf->len + len);
+        len = vsnprintf(buf->data + pos, available, fmt, ap2);
     }
+    buf->len = pos + len;
+    buf->data[buf->len] = '\0';
+    va_end(ap2);
+    return len;
 }
 
-void buffer_consume(buffer_t *buf, ssize_t len) {
+void buffer_consume(buffer_t *buf, ssize_t len)
+{
     if (len <= 0)
         return;