interesting
/
riscv-openocd
mirror of https://github.com/riscv/riscv-openocd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

binarybuffer: Remove unnecessary cast and fix hidden "bug" 

Because of the cast, the const decoration on the parameter provided no
guarantee against modification since it was silently discarded.

Change-Id: Ib83ade955e1a61ee2175c690620437b5e19cbb6a
Signed-off-by: Andreas Fritiofson <andreas.fritiofson@gmail.com>
Reviewed-on: http://openocd.zylin.com/1776
Tested-by: jenkins
Reviewed-by: Spencer Oliver <spen@spen-soft.co.uk>
This commit is contained in:
Andreas Fritiofson 2013-09-28 23:01:07 +02:00 committed by Spencer Oliver
parent 4935709484
commit 01298ca2c8
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/helper/binarybuffer.c
View File

@ -148,7 +148,7 @@ void *buf_set_buf(const void *_src, unsigned src_start,
if ((sq == 0) && (dq == 0) && (lq == 0)) { if ((sq == 0) && (dq == 0) && (lq == 0)) {
for (i = 0; i < lb; i++) for (i = 0; i < lb; i++)
*dst++ = *src++; *dst++ = *src++;
return (uint8_t *)_dst; return _dst;
} }
/* fallback to slow bit copy */ /* fallback to slow bit copy */
@ -167,7 +167,7 @@ void *buf_set_buf(const void *_src, unsigned src_start,
} }
} }
return (uint8_t *)_dst; return _dst;
} }
uint32_t flip_u32(uint32_t value, unsigned int num) uint32_t flip_u32(uint32_t value, unsigned int num)

8
src/helper/binarybuffer.h
View File

@ -42,7 +42,7 @@
static inline void buf_set_u32(void *_buffer, static inline void buf_set_u32(void *_buffer,
unsigned first, unsigned num, uint32_t value) unsigned first, unsigned num, uint32_t value)
{ {
uint8_t *buffer = (uint8_t *)_buffer; uint8_t *buffer = _buffer;
if ((num == 32) && (first == 0)) { if ((num == 32) && (first == 0)) {
buffer[3] = (value >> 24) & 0xff; buffer[3] = (value >> 24) & 0xff;
@ -71,7 +71,7 @@ static inline void buf_set_u32(void *_buffer,
static inline void buf_set_u64(void *_buffer, static inline void buf_set_u64(void *_buffer,
unsigned first, unsigned num, uint64_t value) unsigned first, unsigned num, uint64_t value)
{ {
uint8_t *buffer = (uint8_t *)_buffer; uint8_t *buffer = _buffer;
if ((num == 32) && (first == 0)) { if ((num == 32) && (first == 0)) {
buffer[3] = (value >> 24) & 0xff; buffer[3] = (value >> 24) & 0xff;
@ -109,7 +109,7 @@ static inline void buf_set_u64(void *_buffer,
static inline uint32_t buf_get_u32(const void *_buffer, static inline uint32_t buf_get_u32(const void *_buffer,
unsigned first, unsigned num) unsigned first, unsigned num)
{ {
uint8_t *buffer = (uint8_t *)_buffer; const uint8_t *buffer = _buffer;
if ((num == 32) && (first == 0)) { if ((num == 32) && (first == 0)) {
return (((uint32_t)buffer[3]) << 24) | return (((uint32_t)buffer[3]) << 24) |
@ -138,7 +138,7 @@ static inline uint32_t buf_get_u32(const void *_buffer,
static inline uint64_t buf_get_u64(const void *_buffer, static inline uint64_t buf_get_u64(const void *_buffer,
unsigned first, unsigned num) unsigned first, unsigned num)
{ {
uint8_t *buffer = (uint8_t *)_buffer; const uint8_t *buffer = _buffer;
if ((num == 32) && (first == 0)) { if ((num == 32) && (first == 0)) {
return 0 + ((((uint32_t)buffer[3]) << 24) | /* Note - zero plus is to avoid a checkpatch bug */ return 0 + ((((uint32_t)buffer[3]) << 24) | /* Note - zero plus is to avoid a checkpatch bug */