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

Comparing deliantra/server/include/dynbuf.h (file contents):
Revision 1.5 by root, Mon Apr 23 18:21:54 2007 UTC vs.
Revision 1.6 by root, Mon Apr 30 17:39:58 2007 UTC

     int alloc;
     int size;
     char data[0];
   };
-  char *ptr;
+  char *ptr, *end;
-  int room;
   int ext;
   int _size;
   chunk *first, *last;
 public:
   dynbuf (int initial = 4096, int extend = 16384);
   ~dynbuf ();
-  int size () { return _size + (ptr - last->data); }
+  int  size  () const { return _size + (ptr - last->data); }
+  bool empty () const { return !size (); }
   void linearise (void *data);
-  char *linearise ();
+  char *linearise (); // does not 0-terminate(!)
+  int room () const { return end - ptr; }
   char *force (int size)
   {
-    if (room < size)
+    if (ptr + size >= end)
       _reserve (size);
     return ptr;
   }
   char *alloc (int size)
   {
     char *res = force (size);
-    room -= size;
-    ptr += size;
+    ptr  += size;
     return res;
   }
-  void fadd (char c) { --room; *ptr++ = c; }
+  void fadd (char c) { *ptr++ = c; }
   void fadd (unsigned char c) { fadd (char (c)); }
   void add (const void *p, int len)
   {
     memcpy (alloc (len), p, len);
   //void add_destructive (dynbuf &buf);
   dynbuf &operator << (char c) { add (c); return *this; }
   dynbuf &operator << (unsigned char c) { return *this << char (c); }
   dynbuf &operator << (const char *s) { add (s); return *this; }
+  dynbuf &operator << (const shstr &s) { add (s); return *this; }
   dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; }
   operator std::string ();
 };
   void printf (const char *format, ...);
 };
 #endif

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