diff options
| author | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
|---|---|---|
| committer | vivek <vivek@cumulusnetworks.com> | 2018-03-10 04:14:17 +0000 |
| commit | 7d39cd191c885608731a82a2cedf2b8953d3bf1c (patch) | |
| tree | 6f3003ab8d9b0284d86637849a2d5473ae878005 /lib/ringbuf.c | |
| parent | d0be47e8e152e82270770bdb77aea620ea9b3ab2 (diff) | |
| parent | 58e7db106d5907cb129fcc316f02ce0bf34e3885 (diff) | |
Merge branch 'master' of https://github.com/frrouting/frr into pmsi-parse-display
Conflicts:
bgpd/bgp_attr.c
Diffstat (limited to 'lib/ringbuf.c')
| -rw-r--r-- | lib/ringbuf.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ringbuf.c b/lib/ringbuf.c index 11db502a94..1c3c3e9753 100644 --- a/lib/ringbuf.c +++ b/lib/ringbuf.c @@ -96,7 +96,7 @@ size_t ringbuf_peek(struct ringbuf *buf, size_t offset, void *data, size_t size) size_t remain = ringbuf_remain(buf); if (offset >= remain) return 0; - size_t copysize = MAX(MIN(remain - offset, size), (size_t) 0); + size_t copysize = MAX(MIN(remain - offset, size), (size_t)0); size_t tocopy = copysize; size_t cstart = (buf->start + offset) % buf->size; if (tocopy >= buf->size - cstart) { |