Changeset 417

Timestamp:

09/25/06 17:09:08 (2 years ago)

Author:

alo

Message:

--

Files:

• cherokee/trunk/cherokee/buffer.c (modified) (1 diff)
• cherokee/trunk/cherokee/buffer.h (modified) (1 diff)
• cherokee/trunk/cherokee/server.c (modified) (2 diffs)

cherokee/trunk/cherokee/buffer.c

@@ -175 +175 @@
-{
-        return cherokee_buffer_add (buf, buf2->buf, buf2->len);
+}
+
+
+ret_t 
+cherokee_buffer_add_va_fixed (cherokee_buffer_t  *buf, char *format, ...)
+{
+        cuint_t len;
+        va_list ap;
+
+        va_start (ap, format);
+        len = vsnprintf (buf->buf + buf->len, buf->size - buf->len -1, format, ap);
+        va_end (ap);
+
+        if (unlikely (len < 0)) 
+                return ret_error;
+
+        buf->len += len;
+        return ret_ok;
-}
-

cherokee/trunk/cherokee/buffer.h

@@ -70 +70 @@
-ret_t cherokee_buffer_add                (cherokee_buffer_t  *buf, char *txt, size_t size);
-ret_t cherokee_buffer_add_va             (cherokee_buffer_t  *buf, char *format, ...);
+ret_t cherokee_buffer_add_va_fixed       (cherokee_buffer_t  *buf, char *format, ...);
-ret_t cherokee_buffer_add_va_list        (cherokee_buffer_t  *buf, char *format, va_list args);
-ret_t cherokee_buffer_add_char_n         (cherokee_buffer_t  *buf, char c, int n);

cherokee/trunk/cherokee/server.c

@@ -170 +170 @@
-        CHEROKEE_RWLOCK_WRITER (&n->bogo_now_mutex);
-        cherokee_buffer_init (&n->bogo_now_string);
-
+
+
-        CHEROKEE_RWLOCK_UNLOCK (&n->bogo_now_mutex);
-
@@ -1115 +1116 @@
-
-                        cherokee_buffer_clean  (&srv->bogo_now_string);
-
-
-
-
-
-
-
-
-
-
-
+_fixed
+      
+      
+      
+      
+      
+      
+      
+      
+      
+      
-                }
-        }