[ViewVC] Diff of: cvs/deliantra/server/server/dynbuf.C

Comparing deliantra/server/server/dynbuf.C (file contents):
Revision 1.9 by root, Mon Apr 30 17:39:58 2007 UTC vs.
Revision 1.10 by root, Thu May 3 09:26:45 2007 UTC

 #include <cstdio>
 dynbuf::dynbuf (int initial, int extend)
 {
+  ext = extend;
   _size = 0;
-  ext = extend;
   first = last = (chunk *)salloc<char> (sizeof (chunk) + initial);
   first->alloc = sizeof (chunk) + initial;
   first->next = 0;
   end = ptr + initial;
 }
 dynbuf::~dynbuf ()
 {
-  clear ();
+  _clear ();
 }
 void
-dynbuf::clear ()
+dynbuf::_clear ()
 {
   while (first)
     {
       chunk *next = first->next;
       sfree<char> ((char *)first, first->alloc);
       first = next;
     }
+}
+void
+dynbuf::clear ()
+{
+  _clear ();
+  _size = 0;
+  first = last = (chunk *)salloc<char> (sizeof (chunk) + ext);
+  first->alloc = sizeof (chunk) + ext;
+  first->next = 0;
+  ptr = first->data;
+  end = ptr + ext;
 }
 void
 dynbuf::finish ()
 {
 }
 void
 dynbuf::linearise (void *data)
 {
-  char *p = (char *) data;
   last->size = ptr - last->data;
-  for (chunk * c = first; c; c = c->next)
+  for (chunk *c = first; c; c = c->next)
     {
-      memcpy (p, c->data, c->size);
+      memcpy (data, c->data, c->size);
-      p += c->size;
+      data = (void *)(((char *)data) + c->size);
     }
 }
 char *
 dynbuf::linearise ()
       chunk *add = (chunk *) salloc<char> (sizeof (chunk) + _size);
       add->alloc = sizeof (chunk) + _size;
       add->next = 0;
       linearise ((void *)add->data);
-      clear ();
+      _clear ();
       first = last = add;
       ptr = last->data + _size;
       end = ptr;
       _size = 0;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines