ExternalVendorCode/serval-dna
1
0
Fork 0
mirror of https://github.com/servalproject/serval-dna.git synced 2024-12-23 15:02:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix rotbuf_advance(), add rotbuf_remain()

Browse Source
This commit is contained in:
Andrew Bettison 2013-04-30 17:28:32 +09:30
parent ba57855160
commit 74c82648f2
1 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
rotbuf.h
View File

@ -109,6 +109,20 @@ __ROTBUF_INLINE size_t rotbuf_position(struct rotbuf *rb)
return (rb->cursor - rb->buf) + (rb->ebuf - rb->start); return (rb->cursor - rb->buf) + (rb->ebuf - rb->start);
} }
/* Return the total number of bytes remaining to be advanced to reach the end
* of the given rotated buffer. If the buffer has overrun, this will be zero.
*
* @author Andrew Bettison <andrew@servalproject.com>
*/
__ROTBUF_INLINE size_t rotbuf_remain(struct rotbuf *rb)
{
if (rb->wrap)
return 0;
if (rb->cursor < rb->start)
return rb->start - rb->cursor;
return (rb->ebuf - rb->cursor) + (rb->start - rb->buf);
}
/* Return the total number of bytes advanced through the given rotated buffer, including any /* Return the total number of bytes advanced through the given rotated buffer, including any
* overrun. * overrun.
* *
@ -132,13 +146,17 @@ __ROTBUF_INLINE void rotbuf_advance(struct rotbuf *rb, size_t len)
if (rb->wrap) if (rb->wrap)
rb->wrap += len; rb->wrap += len;
else if (len) { else if (len) {
rb->cursor += len; if (rb->cursor >= rb->start) {
if (rb->cursor >= rb->ebuf) { if ((rb->cursor += len) >= rb->ebuf) {
rb->cursor -= rb->buf - rb->ebuf; rb->cursor -= rb->ebuf - rb->buf;
if (rb->cursor >= rb->start) { if (rb->cursor >= rb->start) {
rb->wrap = 1 + rb->cursor - rb->start; rb->wrap = 1 + (rb->cursor - rb->start);
rb->cursor = rb->start; rb->cursor = rb->start;
}
} }
} else if ((rb->cursor += len) >= rb->start) {
rb->wrap = 1 + (rb->cursor - rb->start);
rb->cursor = rb->start;
} }
} }
} }