--- deliantra/server/include/dynbuf.h	2007/04/30 17:39:58	1.6
+++ deliantra/server/include/dynbuf.h	2007/05/27 23:49:49	1.10
@@ -4,6 +4,7 @@
 #include <cstring>
 #include <cassert>
 
+#include "util.h"
 #include "shstr.h"
 
 // this is a "buffer" that can grow fast
@@ -30,6 +31,7 @@
   chunk *first, *last;
 
   void _reserve (int size);
+  void _clear ();
   void clear ();
   void finish ();
 
@@ -48,25 +50,36 @@
 
   char *force (int size)
   {
-    if (ptr + size >= end)
+    if (expect_false (ptr + size >= end))
       _reserve (size);
 
     return ptr;
   }
 
-  char *alloc (int size)
+  char *falloc (int size)
   {
-    char *res = force (size);
-    ptr  += size;
+    char *res = ptr;
+    ptr += size;
     return res;
   }
 
+  char *alloc (int size)
+  {
+    force (size);
+    return falloc (size);
+  }
+
   void fadd (char c) { *ptr++ = c; }
   void fadd (unsigned char c) { fadd (char (c)); }
+  void fadd (const void *p, int len)
+  {
+    memcpy (falloc (len), p, len);
+  }
 
   void add (const void *p, int len)
   {
-    memcpy (alloc (len), p, len);
+    force (len);
+    fadd (p, len);
   }
 
   void add (char c)
@@ -104,9 +117,6 @@
 
   using dynbuf::add;
 
-  static const int max_sint32_size = 11;
-  static const int max_sint64_size = 20;
-
   void add (sint32 i);
   void add (sint64 i);