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.4 by root, Mon Apr 23 18:09:57 2007 UTC vs.
Revision 1.6 by root, Mon Apr 30 17:39:58 2007 UTC

16{ 16{
17protected: 17protected:
18 struct chunk 18 struct chunk
19 { 19 {
20 chunk *next; 20 chunk *next;
21 int alloc;
21 int size; 22 int size;
22 char data[0]; 23 char data[0];
23 }; 24 };
24 25
25 char *ptr; 26 char *ptr, *end;
26 int room;
27 int ext; 27 int ext;
28 int _size; 28 int _size;
29 29
30 chunk *first, *last; 30 chunk *first, *last;
31 31
36public: 36public:
37 37
38 dynbuf (int initial = 4096, int extend = 16384); 38 dynbuf (int initial = 4096, int extend = 16384);
39 ~dynbuf (); 39 ~dynbuf ();
40 40
41 int size () { return _size + (ptr - last->data); } 41 int size () const { return _size + (ptr - last->data); }
42 bool empty () const { return !size (); }
42 43
43 void linearise (void *data); 44 void linearise (void *data);
44 char *linearise (); 45 char *linearise (); // does not 0-terminate(!)
46
47 int room () const { return end - ptr; }
45 48
46 char *force (int size) 49 char *force (int size)
47 { 50 {
48 if (room < size) 51 if (ptr + size >= end)
49 _reserve (size); 52 _reserve (size);
50 53
51 return ptr; 54 return ptr;
52 } 55 }
53 56
54 char *alloc (int size) 57 char *alloc (int size)
55 { 58 {
56 char *res = force (size); 59 char *res = force (size);
57
58 room -= size;
59 ptr += size; 60 ptr += size;
60
61 return res; 61 return res;
62 } 62 }
63 63
64 void fadd (char c) { --room; *ptr++ = c; } 64 void fadd (char c) { *ptr++ = c; }
65 void fadd (unsigned char c) { fadd (char (c)); } 65 void fadd (unsigned char c) { fadd (char (c)); }
66 66
67 void add (const void *p, int len) 67 void add (const void *p, int len)
68 { 68 {
69 memcpy (alloc (len), p, len); 69 memcpy (alloc (len), p, len);
88 //void add_destructive (dynbuf &buf); 88 //void add_destructive (dynbuf &buf);
89 89
90 dynbuf &operator << (char c) { add (c); return *this; } 90 dynbuf &operator << (char c) { add (c); return *this; }
91 dynbuf &operator << (unsigned char c) { return *this << char (c); } 91 dynbuf &operator << (unsigned char c) { return *this << char (c); }
92 dynbuf &operator << (const char *s) { add (s); return *this; } 92 dynbuf &operator << (const char *s) { add (s); return *this; }
93 dynbuf &operator << (const shstr &s) { add (s); return *this; }
93 dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; } 94 dynbuf &operator << (const std::string &s) { add (s.data(), s.size ()); return *this; }
94 95
95 operator std::string (); 96 operator std::string ();
96}; 97};
97 98
111 112
112 void printf (const char *format, ...); 113 void printf (const char *format, ...);
113}; 114};
114 115
115#endif 116#endif
117

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines