--- deliantra/server/include/dynbuf.h 2009/10/12 14:00:58 1.22
+++ deliantra/server/include/dynbuf.h 2016/11/16 23:42:00 1.35
@@ -1,24 +1,24 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
- *
- * 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
- *
+ *
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 Frank Tore Johansen
+ *
* 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 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
*/
@@ -28,6 +28,7 @@
#include
#include
+#include "compiler.h"
#include "util.h"
#include "shstr.h"
@@ -57,7 +58,7 @@
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:
@@ -91,14 +92,24 @@
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;
}
+ // used for force + alloc combo
+ void alloc (char *p)
+ {
+ ptr = p;
+ }
+
+ // allocate size bytes and return pointer to them (caller must force())
char *falloc (int size)
{
char *res = ptr;
@@ -106,6 +117,7 @@
return res;
}
+ // allocate size bytes and return pointer to them
char *alloc (int size)
{
force (size);
@@ -140,6 +152,10 @@
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);
@@ -176,14 +192,21 @@
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