projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'xilinx-for-v2020.07' of https://gitlab.denx.de/u-boot/custodians/u-boot...
[oweals/u-boot.git]
/
lib
/
circbuf.c
diff --git
a/lib/circbuf.c
b/lib/circbuf.c
index 9848da3b7b6182df3957a8ac4c9dbfe8271d693f..071e4fb8a6a97f14645576134e197d32b6205115 100644
(file)
--- a/
lib/circbuf.c
+++ b/
lib/circbuf.c
@@
-1,8
+1,7
@@
+// SPDX-License-Identifier: GPL-2.0+
/*
* (C) Copyright 2003
* Gerry Hamel, geh@ti.com, Texas Instruments
/*
* (C) Copyright 2003
* Gerry Hamel, geh@ti.com, Texas Instruments
- *
- * SPDX-License-Identifier: GPL-2.0+
*/
#include <common.h>
*/
#include <common.h>
@@
-41,11
+40,13
@@
int buf_free (circbuf_t * buf)
int buf_pop (circbuf_t * buf, char *dest, unsigned int len)
{
unsigned int i;
int buf_pop (circbuf_t * buf, char *dest, unsigned int len)
{
unsigned int i;
- char *p
= buf->top
;
+ char *p;
assert (buf != NULL);
assert (dest != NULL);
assert (buf != NULL);
assert (dest != NULL);
+ p = buf->top;
+
/* Cap to number of bytes in buffer */
if (len > buf->size)
len = buf->size;
/* Cap to number of bytes in buffer */
if (len > buf->size)
len = buf->size;
@@
-69,11
+70,13
@@
int buf_push (circbuf_t * buf, const char *src, unsigned int len)
{
/* NOTE: this function allows push to overwrite old data. */
unsigned int i;
{
/* NOTE: this function allows push to overwrite old data. */
unsigned int i;
- char *p
= buf->tail
;
+ char *p;
assert (buf != NULL);
assert (src != NULL);
assert (buf != NULL);
assert (src != NULL);
+ p = buf->tail;
+
for (i = 0; i < len; i++) {
*p++ = src[i];
if (p == buf->end) {
for (i = 0; i < len; i++) {
*p++ = src[i];
if (p == buf->end) {