--- deliantra/server/include/dynbuf.h 2007/07/10 05:51:38 1.13
+++ deliantra/server/include/dynbuf.h 2009/11/09 03:08:24 1.28
@@ -1,24 +1,25 @@
/*
- * 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,2009 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
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * 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
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
#ifndef DYNBUF_H__
@@ -27,6 +28,7 @@
#include
#include
+#include "compiler.h"
#include "util.h"
#include "shstr.h"
@@ -50,13 +52,13 @@
char *ptr, *end;
int _size;
- int extend;
+ int extend, cextend;
chunk *first, *last;
void reserve (int size);
void init (int initial); // allocate sinitial chunk
void free (chunk *&chain); // free chain of chunks
- char *_linearise ();
+ char *_linearise (int extra = 0);
void finalise ();
public:
@@ -90,14 +92,18 @@
int room () const { return end - ptr; }
+ // make sure we have "size" extra room
char *force (int size)
{
- if (expect_false (ptr + size >= end))
+ if (expect_false (ptr + size > end))
reserve (size);
+ assume (ptr + size <= end);
+
return ptr;
}
+ // allocate size bytes and return pointer to them (caller must force())
char *falloc (int size)
{
char *res = ptr;
@@ -105,6 +111,7 @@
return res;
}
+ // allocate size bytes and return pointer to them
char *alloc (int size)
{
force (size);
@@ -134,18 +141,22 @@
add (s, strlen (s));
}
- void add (const shstr &s)
+ void add (shstr_tmp s)
{
add (s.s, s.length ());
}
+ // rather inefficient
+ void splice (int offset, int olen, const char *s, int slen);
+ void splice (int offset, int olen) { splice (offset, olen, "", 0); }
+
//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 ();
@@ -161,23 +172,35 @@
void add (sint32 i);
void add (sint64 i);
- //TODO: should optimise the case printf "(name %+d)" as it comes up extreemly often
+ //TODO: should optimise the case printf "(name %+d)" as it comes up extremely often
- using dynbuf::operator <<;
- dynbuf &operator << (sint16 i) { add (sint32 (i)); return *this; }
- dynbuf &operator << (uint16 i) { add (sint32 (i)); return *this; }
- dynbuf &operator << (sint32 i) { add (sint32 (i)); return *this; }
- dynbuf &operator << (sint64 i) { add (sint64 (i)); return *this; }
- dynbuf &operator << (uint32 i) { add (sint64 (i)); return *this; }
- dynbuf &operator << (uint64 i) { add (sint64 (i)); return *this; }
+ //using dynbuf::operator <<; // doesn't work, sometimes C++ just suxx
+ // instead we use an ugly template function
+ template
+ 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 printf (const char *format, ...) attribute ((format (printf, 2, 3)));
+ void vprintf (const char *format, va_list ap);
void add_abilities (const char *name, uint32 abilities);
void add_paths (const char *name, uint32 paths);
+ // we need to redefine, to keep the API :/
+ using dynbuf::splice;
+ void splice (int offset, int olen, const char *s)
+ {
+ dynbuf::splice (offset, olen, s, strlen (s));
+ }
+
// returns the string, linearised and with trailing \0
- operator const char * ();
+ operator char *();
};
#endif