lib: add ringbuf_copy()

Quick 'n easy way to copy the contents of one ringbuf to another.

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

diff --git a/lib/ringbuf.c b/lib/ringbuf.c
index f8e9a9bd8a2a8aec4b4f01cac62270e64c2aca60..d4efbe05fbf5e13f0dd9b9346c196faafa8ad30d 100644 (file)
--- a/lib/ringbuf.c
+++ b/lib/ringbuf.c
@@ -110,6 +110,15 @@ size_t ringbuf_peek(struct ringbuf *buf, size_t offset, void *data, size_t size)
        return copysize;
 }
 
+size_t ringbuf_copy(struct ringbuf *to, struct ringbuf *from, size_t size)
+{
+       size_t tocopy = MIN(ringbuf_space(to), size);
+       uint8_t *cbuf = XCALLOC(MTYPE_TMP, tocopy);
+       tocopy = ringbuf_peek(from, 0, cbuf, tocopy);
+       XFREE(MTYPE_TMP, cbuf);
+       return ringbuf_put(to, cbuf, tocopy);
+}
+
 void ringbuf_reset(struct ringbuf *buf)
 {
        buf->start = buf->end = 0;

diff --git a/lib/ringbuf.h b/lib/ringbuf.h
index 2288a2716fcbd042fcc3f6b4e8c7db78709d0a7a..15049e3eeab7d426621c246d40fcd79c610b39f7 100644 (file)
--- a/lib/ringbuf.h
+++ b/lib/ringbuf.h
@@ -98,6 +98,16 @@ size_t ringbuf_get(struct ringbuf *buf, void *data, size_t size);
 size_t ringbuf_peek(struct ringbuf *buf, size_t offset, void *data,
                    size_t size);
 
+/*
+ * Copy data from one ringbuf to another.
+ *
+ * @param to   destination ringbuf
+ * @param from source ringbuf
+ * @param size how much data to copy
+ * @return amount of data copied
+ */
+size_t ringbuf_copy(struct ringbuf *to, struct ringbuf *from, size_t size);
+
 /*
  * Reset buffer. Does not wipe.
  *