Apple-2-SW/contiki
1
0
Fork 0
mirror of https://github.com/oliverschmidt/contiki.git synced 2024-12-30 15:30:30 +00:00
Code Issues Projects Releases Wiki Activity

ringbufindex: fix bugs of ringbufindex_peek_{put,get}

Browse Source
This commit is contained in:
Yasuyuki Tanaka 2017-01-11 21:44:29 +01:00
parent fbf9bb9e64
commit 2d42b91c7b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/lib/ringbufindex.c
View File

@ -83,7 +83,7 @@ ringbufindex_peek_put(const struct ringbufindex *r)
if(((r->put_ptr - r->get_ptr) & r->mask) == r->mask) { if(((r->put_ptr - r->get_ptr) & r->mask) == r->mask) {
return -1; return -1;
} }
return (r->put_ptr + 1) & r->mask; return r->put_ptr;
} }
/* Remove the first element and return its index */ /* Remove the first element and return its index */
int int
@ -118,7 +118,7 @@ ringbufindex_peek_get(const struct ringbufindex *r)
first one. If there are no bytes left, we return -1. first one. If there are no bytes left, we return -1.
*/ */
if(((r->put_ptr - r->get_ptr) & r->mask) > 0) { if(((r->put_ptr - r->get_ptr) & r->mask) > 0) {
return (r->get_ptr + 1) & r->mask; return r->get_ptr;
} else { } else {
return -1; return -1;
} }