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

Comparing deliantra/server/include/dynbuf.h (file contents):
Revision 1.12 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.24 by root, Thu Oct 15 22:50:42 2009 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #ifndef DYNBUF_H__
 #define DYNBUF_H__
+#include <cstdarg>
 #include <cstring>
 #include <cassert>
 #include "util.h"
 #include "shstr.h"
     int size;
     char data[0];
   };
   char *ptr, *end;
-  int ext;
   int _size;
+  int extend, cextend;
   chunk *first, *last;
-  void _reserve (int size);
+  void reserve (int size);
-  void _clear ();
+  void init (int initial);  // allocate sinitial chunk
-  void clear ();
+  void free (chunk *&chain); // free chain of chunks
+  char *_linearise ();
-  void finish ();
+  void finalise ();
 public:
+  // initial - the size of the initial chunk to be allocated
+  // extend  - first incremental step when buffer size exceeded
-  dynbuf (int initial = 4096, int extend = 16384);
+  dynbuf (int initial = 4096, int extend = 16384)
+  : extend (extend)
+  {
+    init (initial);
+  }
-  ~dynbuf ();
+  ~dynbuf ()
+  {
+    free (first);
+  }
+  // resets the dynbuf, but does not free the first chunk
+  // which is either of size "initial" or the size of the last
+  // linearise
+  void clear ();
   int  size  () const { return _size + (ptr - last->data); }
   bool empty () const { return !size (); }
   void linearise (void *data);
-  char *linearise (); // does not 0-terminate(!)
+  char *linearise () // does not 0-terminate(!)
+  {
+    return first->next ? _linearise () : first->data;
+  }
   int room () const { return end - ptr; }
   char *force (int size)
   {
     if (expect_false (ptr + size >= end))
-      _reserve (size);
+      reserve (size);
     return ptr;
   }
   char *falloc (int size)
   void add (const char *s)
   {
      add (s, strlen (s));
   }
-  void add (const shstr &s)
+  void add (shstr_tmp s)
   {
     add (s.s, s.length ());
   }
   //TODO
   //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 << (shstr_tmp s) { add (s); return *this; }
   dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; }
   operator std::string ();
 };
   dynbuf_text (int initial = 4096, int extend = 16384)
   : dynbuf (initial, extend)
   { }
   using dynbuf::add;
   void add (sint32 i);
   void add (sint64 i);
+  //TODO: should optimise the case printf "(name %+d)" as it comes up extremely often
+  //using dynbuf::operator <<; // doesn't work, sometimes C++ just suxx
+  // instead we use an ugly template function
+  template<typename T>
+  dynbuf_text &operator << (T c) { *(dynbuf *)this << c; return *this; }
+  dynbuf_text &operator << (sint16 i) { add (sint32 (i)); return *this; }
+  dynbuf_text &operator << (uint16 i) { add (sint32 (i)); return *this; }
+  dynbuf_text &operator << (sint32 i) { add (sint32 (i)); return *this; }
+  dynbuf_text &operator << (sint64 i) { add (sint64 (i)); return *this; }
+  dynbuf_text &operator << (uint32 i) { add (sint64 (i)); return *this; }
+  dynbuf_text &operator << (uint64 i) { add (sint64 (i)); return *this; }
   void printf (const char *format, ...);
+  void vprintf (const char *format, va_list ap);
+  void add_abilities (const char *name, uint32 abilities);
+  void add_paths     (const char *name, uint32 paths);
+  // returns the string, linearised and with trailing \0
+  operator char *();
 };
 #endif

Diff Legend

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

Comparing deliantra/server/include/dynbuf.h (file contents): Revision 1.12 by root, Sun Jul 1 05:00:18 2007 UTC vs. Revision 1.24 by root, Thu Oct 15 22:50:42 2009 UTC

Diff Legend

Comparing deliantra/server/include/dynbuf.h (file contents):
Revision 1.12 by root, Sun Jul 1 05:00:18 2007 UTC vs.
Revision 1.24 by root, Thu Oct 15 22:50:42 2009 UTC