Merge pull request #13649 from donaldsharp/unlock_the_node_or_else

[mirror_frr.git] / lib / ringbuf.c

diff --git a/lib/ringbuf.c b/lib/ringbuf.c
index 11db502a94870ae2069fe0d48137777c83132667..3cd7b4987220c94d097d021797cf4600143a48d7 100644 (file)
--- a/lib/ringbuf.c
+++ b/lib/ringbuf.c
@@ -1,28 +1,15 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * Circular buffer implementation.
  * Copyright (C) 2017 Cumulus Networks
  * Quentin Young
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; either version 2 of the License, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include <zebra.h>
 
 #include "ringbuf.h"
 #include "memory.h"
 
-DEFINE_MTYPE_STATIC(LIB, RINGBUFFER, "Ring buffer")
+DEFINE_MTYPE_STATIC(LIB, RINGBUFFER, "Ring buffer");
 
 struct ringbuf *ringbuf_new(size_t size)
 {
@@ -96,7 +83,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) {