… | |
… | |
4 | |
4 | |
5 | dynbuf::dynbuf (int initial, int extend) |
5 | dynbuf::dynbuf (int initial, int extend) |
6 | { |
6 | { |
7 | _size = 0; |
7 | _size = 0; |
8 | ext = extend; |
8 | ext = extend; |
|
|
9 | |
9 | first = last = (chunk *) new char[sizeof (chunk) + initial]; |
10 | first = last = (chunk *)salloc<char> (sizeof (chunk) + initial); |
10 | |
11 | first->alloc = sizeof (chunk) + initial; |
11 | first->next = 0; |
12 | first->next = 0; |
12 | room = initial; |
13 | |
13 | ptr = first->data; |
14 | ptr = first->data; |
|
|
15 | end = ptr + initial; |
14 | } |
16 | } |
15 | |
17 | |
16 | dynbuf::~dynbuf () |
18 | dynbuf::~dynbuf () |
17 | { |
19 | { |
18 | clear (); |
20 | clear (); |
… | |
… | |
23 | { |
25 | { |
24 | while (first) |
26 | while (first) |
25 | { |
27 | { |
26 | chunk *next = first->next; |
28 | chunk *next = first->next; |
27 | |
29 | |
28 | delete[](char *) first; |
30 | sfree<char> ((char *)first, first->alloc); |
29 | first = next; |
31 | first = next; |
30 | } |
32 | } |
31 | } |
33 | } |
32 | |
34 | |
33 | void |
35 | void |
… | |
… | |
47 | ext += ext >> 1; |
49 | ext += ext >> 1; |
48 | ext = (ext + 15) & ~15; |
50 | ext = (ext + 15) & ~15; |
49 | } |
51 | } |
50 | while (ext < size); |
52 | while (ext < size); |
51 | |
53 | |
52 | chunk *add = (chunk *) new char[sizeof (chunk) + ext]; |
54 | chunk *add = (chunk *) salloc<char> (sizeof (chunk) + ext); |
53 | |
55 | add->alloc = sizeof (chunk) + ext; |
54 | add->next = 0; |
56 | add->next = 0; |
55 | |
57 | |
56 | last->next = add; |
58 | last->next = add; |
57 | last = add; |
59 | last = add; |
58 | |
60 | |
59 | room = ext; |
|
|
60 | ptr = last->data; |
61 | ptr = last->data; |
|
|
62 | end = ptr + ext; |
61 | } |
63 | } |
62 | |
64 | |
63 | void |
65 | void |
64 | dynbuf::linearise (void *data) |
66 | dynbuf::linearise (void *data) |
65 | { |
67 | { |
… | |
… | |
79 | { |
81 | { |
80 | if (first->next) |
82 | if (first->next) |
81 | { |
83 | { |
82 | finish (); |
84 | finish (); |
83 | |
85 | |
84 | chunk *add = (chunk *) new char[sizeof (chunk) + _size]; |
86 | chunk *add = (chunk *) salloc<char> (sizeof (chunk) + _size); |
85 | |
87 | add->alloc = sizeof (chunk) + _size; |
86 | add->next = 0; |
88 | add->next = 0; |
|
|
89 | |
87 | linearise ((void *) add->data); |
90 | linearise ((void *)add->data); |
88 | clear (); |
91 | clear (); |
89 | |
92 | |
90 | first = last = add; |
93 | first = last = add; |
91 | ptr = last->data + _size; |
94 | ptr = last->data + _size; |
|
|
95 | end = ptr; |
92 | _size = 0; |
96 | _size = 0; |
93 | room = 0; |
|
|
94 | } |
97 | } |
95 | |
98 | |
96 | return first->data; |
99 | return first->data; |
97 | } |
100 | } |
98 | |
101 | |
|
|
102 | dynbuf::operator std::string () |
|
|
103 | { |
|
|
104 | // could optimise |
|
|
105 | return std::string (linearise (), size ()); |
|
|
106 | } |
|
|
107 | |
99 | void |
108 | void |
|
|
109 | dynbuf_text::printf (const char *format, ...) |
|
|
110 | { |
|
|
111 | int len; |
|
|
112 | |
|
|
113 | { |
|
|
114 | force (128); |
|
|
115 | |
|
|
116 | va_list ap; |
|
|
117 | va_start (ap, format); |
|
|
118 | len = vsnprintf (ptr, end - ptr, format, ap); |
|
|
119 | va_end (ap); |
|
|
120 | |
|
|
121 | assert (len >= 0); // shield against broken vsnprintf's |
|
|
122 | |
|
|
123 | // was enough room available |
|
|
124 | if (ptr + len < end) |
|
|
125 | { |
|
|
126 | alloc (len); |
|
|
127 | return; |
|
|
128 | } |
|
|
129 | } |
|
|
130 | |
|
|
131 | // longer, try harder |
|
|
132 | va_list ap; |
|
|
133 | va_start (ap, format); |
|
|
134 | vsnprintf (force (len + 1), len + 1, format, ap); |
|
|
135 | va_end (ap); |
|
|
136 | |
|
|
137 | alloc (len); |
|
|
138 | } |
|
|
139 | |
|
|
140 | void |
100 | dynbuf::add (sint32 i) |
141 | dynbuf_text::add (sint32 i) |
101 | { |
142 | { |
102 | char buf[max_sint32_size]; |
143 | char buf[max_sint32_size]; |
103 | char *p = buf + sizeof (buf); |
144 | char *p = buf + sizeof (buf); |
104 | char neg; |
145 | char neg; |
105 | |
146 | |
… | |
… | |
130 | |
171 | |
131 | add ((void *) p, buf + sizeof (buf) - p); |
172 | add ((void *) p, buf + sizeof (buf) - p); |
132 | } |
173 | } |
133 | |
174 | |
134 | void |
175 | void |
135 | dynbuf::add (sint64 i) |
176 | dynbuf_text::add (sint64 i) |
136 | { |
177 | { |
137 | if (i > -10000000 && i < 10000000) |
178 | if (i > -10000000 && i < 10000000) |
138 | { |
179 | { |
139 | add (sint32 (i)); |
180 | add (sint32 (i)); |
140 | return; |
181 | return; |