kaspar/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2026-01-01 01:41:18 +01:00
Code Releases Activity

sys:ringbuffer: use memcpy in ringbuffer_get

Browse Source
This commit is contained in:
René Kijewski 2014-09-11 14:12:06 +02:00
parent c0914ec451
commit 9cccf6bf8e
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sys/lib/ringbuffer.c
View File

@ -18,6 +18,8 @@
#include "ringbuffer.h"
#include <string.h>
/**
* @brief Add an element to the end of the ringbuffer.
* @details This helper function does not check the pre-requirements for adding,
@ -87,9 +89,23 @@ unsigned ringbuffer_get(ringbuffer_t *restrict rb, char *buf, unsigned n)
if (n > rb->avail) {
n = rb->avail;
}
for (unsigned i = 0; i < n; ++i) {
buf[i] = get_head(rb);
if (n > 0) {
unsigned bytes_till_end = rb->size - rb->start;
if (bytes_till_end >= n) {
memcpy(buf, rb->buf + rb->start, n);
if (bytes_till_end == n) {
rb->start = 0;
}
else {
rb->start += n;
}
}
else {
memcpy(buf, rb->buf + rb->start, bytes_till_end);
rb->start = n - bytes_till_end;
memcpy(buf + bytes_till_end, rb->buf, rb->start);
}
rb->avail -= n;
}
return n;
}