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.5 by root, Mon Apr 23 18:21:54 2007 UTC vs.
Revision 1.7 by root, Thu May 3 09:26:45 2007 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines