OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mm/circbuf.c: Fix incorrect usage of void* arithmetics

This commit is contained in:
Ville Juven 2022-11-23 12:37:27 +02:00 committed by Xiang Xiao
parent 4781379ee2
commit 39a567db20
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mm/circbuf/circbuf.c
View File

@ -320,8 +320,8 @@ ssize_t circbuf_peekat(FAR struct circbuf_s *circ, size_t pos,
len = bytes; len = bytes;
} }
memcpy(dst, circ->base + off, len); memcpy(dst, (FAR char *)circ->base + off, len);
memcpy(dst + len, circ->base, bytes - len); memcpy((FAR char *)dst + len, circ->base, bytes - len);
return bytes; return bytes;
} }
@ -468,8 +468,8 @@ ssize_t circbuf_write(FAR struct circbuf_s *circ,
space = bytes; space = bytes;
} }
memcpy(circ->base + off, src, space); memcpy((FAR char *)circ->base + off, src, space);
memcpy(circ->base, src + space, bytes - space); memcpy(circ->base, (FAR char *)src + space, bytes - space);
circ->head += bytes; circ->head += bytes;
return bytes; return bytes;
@ -514,7 +514,7 @@ ssize_t circbuf_overwrite(FAR struct circbuf_s *circ,
if (bytes > circ->size) if (bytes > circ->size)
{ {
src += bytes - circ->size; src = (FAR const void *)((FAR char *)src + bytes - circ->size);
bytes = circ->size; bytes = circ->size;
} }
@ -531,8 +531,8 @@ ssize_t circbuf_overwrite(FAR struct circbuf_s *circ,
space = bytes; space = bytes;
} }
memcpy(circ->base + off, src, space); memcpy((FAR char *)circ->base + off, src, space);
memcpy(circ->base, src + space, bytes - space); memcpy(circ->base, (FAR char *)src + space, bytes - space);
circ->head += bytes; circ->head += bytes;
circ->tail += overwrite; circ->tail += overwrite;