ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/dynbuf.h
(Generate patch)

Comparing deliantra/server/include/dynbuf.h (file contents):
Revision 1.24 by root, Thu Oct 15 22:50:42 2009 UTC vs.
Revision 1.27 by root, Sat Nov 7 18:30:05 2009 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
23 */ 23 */
24 24
25#ifndef DYNBUF_H__ 25#ifndef DYNBUF_H__
26#define DYNBUF_H__ 26#define DYNBUF_H__
27 27
28#include <cstdarg>
29#include <cstring> 28#include <cstring>
30#include <cassert> 29#include <cassert>
31 30
32#include "util.h" 31#include "util.h"
33#include "shstr.h" 32#include "shstr.h"
56 chunk *first, *last; 55 chunk *first, *last;
57 56
58 void reserve (int size); 57 void reserve (int size);
59 void init (int initial); // allocate sinitial chunk 58 void init (int initial); // allocate sinitial chunk
60 void free (chunk *&chain); // free chain of chunks 59 void free (chunk *&chain); // free chain of chunks
61 char *_linearise (); 60 char *_linearise (int extra = 0);
62 void finalise (); 61 void finalise ();
63 62
64public: 63public:
65 64
66 // initial - the size of the initial chunk to be allocated 65 // initial - the size of the initial chunk to be allocated
90 return first->next ? _linearise () : first->data; 89 return first->next ? _linearise () : first->data;
91 } 90 }
92 91
93 int room () const { return end - ptr; } 92 int room () const { return end - ptr; }
94 93
94 // make sure we have "size" extra room
95 char *force (int size) 95 char *force (int size)
96 { 96 {
97 if (expect_false (ptr + size >= end)) 97 if (expect_false (ptr + size >= end))
98 reserve (size); 98 reserve (size);
99 99
100 return ptr; 100 return ptr;
101 } 101 }
102 102
103 // allocate size bytes and return pointer to them (caller must force())
103 char *falloc (int size) 104 char *falloc (int size)
104 { 105 {
105 char *res = ptr; 106 char *res = ptr;
106 ptr += size; 107 ptr += size;
107 return res; 108 return res;
108 } 109 }
109 110
111 // allocate size bytes and return pointer to them
110 char *alloc (int size) 112 char *alloc (int size)
111 { 113 {
112 force (size); 114 force (size);
113 return falloc (size); 115 return falloc (size);
114 } 116 }
138 140
139 void add (shstr_tmp s) 141 void add (shstr_tmp s)
140 { 142 {
141 add (s.s, s.length ()); 143 add (s.s, s.length ());
142 } 144 }
145
146 // rather inefficient
147 void splice (int offset, int olen, const char *s, int slen);
148 void splice (int offset, int olen) { splice (offset, olen, "", 0); }
143 149
144 //TODO 150 //TODO
145 //void add_destructive (dynbuf &buf); 151 //void add_destructive (dynbuf &buf);
146 152
147 dynbuf &operator << (char c) { add (c); return *this; } 153 dynbuf &operator << (char c) { add (c); return *this; }
175 dynbuf_text &operator << (sint32 i) { add (sint32 (i)); return *this; } 181 dynbuf_text &operator << (sint32 i) { add (sint32 (i)); return *this; }
176 dynbuf_text &operator << (sint64 i) { add (sint64 (i)); return *this; } 182 dynbuf_text &operator << (sint64 i) { add (sint64 (i)); return *this; }
177 dynbuf_text &operator << (uint32 i) { add (sint64 (i)); return *this; } 183 dynbuf_text &operator << (uint32 i) { add (sint64 (i)); return *this; }
178 dynbuf_text &operator << (uint64 i) { add (sint64 (i)); return *this; } 184 dynbuf_text &operator << (uint64 i) { add (sint64 (i)); return *this; }
179 185
180 void printf (const char *format, ...); 186 void printf (const char *format, ...) attribute ((format (printf, 2, 3)));
181 void vprintf (const char *format, va_list ap); 187 void vprintf (const char *format, va_list ap);
182 188
183 void add_abilities (const char *name, uint32 abilities); 189 void add_abilities (const char *name, uint32 abilities);
184 void add_paths (const char *name, uint32 paths); 190 void add_paths (const char *name, uint32 paths);
191
192 // we need to redefine, to keep the API :/
193 using dynbuf::splice;
194 void splice (int offset, int olen, const char *s)
195 {
196 dynbuf::splice (offset, olen, s, strlen (s));
197 }
185 198
186 // returns the string, linearised and with trailing \0 199 // returns the string, linearised and with trailing \0
187 operator char *(); 200 operator char *();
188}; 201};
189 202

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines