summaryrefslogtreecommitdiff
path: root/toxcore/util.c
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2015-11-03 13:42:05 -0500
committerirungentoo <irungentoo@gmail.com>2015-11-03 13:42:05 -0500
commit6a494e2cbdd146bb13185d8220061322661a5f5a (patch)
tree6cb23bca09894cde6173bc7a362a112d72872215 /toxcore/util.c
parentf435e94397feb3121ef334de6873b93adaaf01dd (diff)
Astyle.
Diffstat (limited to 'toxcore/util.c')
-rw-r--r--toxcore/util.c26
1 files changed, 14 insertions, 12 deletions
diff --git a/toxcore/util.c b/toxcore/util.c
index 81fa84c6..28d8721c 100644
--- a/toxcore/util.c
+++ b/toxcore/util.c
@@ -209,18 +209,19 @@ bool rb_empty(const RingBuffer *b)
209{ 209{
210 return b->end == b->start; 210 return b->end == b->start;
211} 211}
212void* rb_write(RingBuffer *b, void *p) 212void *rb_write(RingBuffer *b, void *p)
213{ 213{
214 void* rc = NULL; 214 void *rc = NULL;
215
215 if ((b->end + 1) % b->size == b->start) /* full */ 216 if ((b->end + 1) % b->size == b->start) /* full */
216 rc = b->data[b->start]; 217 rc = b->data[b->start];
217 218
218 b->data[b->end] = p; 219 b->data[b->end] = p;
219 b->end = (b->end + 1) % b->size; 220 b->end = (b->end + 1) % b->size;
220 221
221 if (b->end == b->start) 222 if (b->end == b->start)
222 b->start = (b->start + 1) % b->size; 223 b->start = (b->start + 1) % b->size;
223 224
224 return rc; 225 return rc;
225} 226}
226bool rb_read(RingBuffer *b, void **p) 227bool rb_read(RingBuffer *b, void **p)
@@ -229,7 +230,7 @@ bool rb_read(RingBuffer *b, void **p)
229 *p = NULL; 230 *p = NULL;
230 return false; 231 return false;
231 } 232 }
232 233
233 *p = b->data[b->start]; 234 *p = b->data[b->start];
234 b->start = (b->start + 1) % b->size; 235 b->start = (b->start + 1) % b->size;
235 return true; 236 return true;
@@ -256,21 +257,22 @@ void rb_kill(RingBuffer *b)
256 free(b); 257 free(b);
257 } 258 }
258} 259}
259uint16_t rb_size(const RingBuffer* b) 260uint16_t rb_size(const RingBuffer *b)
260{ 261{
261 if (rb_empty(b)) 262 if (rb_empty(b))
262 return 0; 263 return 0;
263 264
264 return 265 return
265 b->end > b->start ? 266 b->end > b->start ?
266 b->end - b->start : 267 b->end - b->start :
267 (b->size - b->start) + b->end; 268 (b->size - b->start) + b->end;
268} 269}
269uint16_t rb_data(const RingBuffer* b, void** dest) 270uint16_t rb_data(const RingBuffer *b, void **dest)
270{ 271{
271 uint16_t i = 0; 272 uint16_t i = 0;
273
272 for (; i < rb_size(b); i++) 274 for (; i < rb_size(b); i++)
273 dest[i] = b->data[(b->start + i) % b->size]; 275 dest[i] = b->data[(b->start + i) % b->size];
274 276
275 return i; 277 return i;
276} 278}