helper: Code cleanup for hexify()
Simplify hexify() and do not longer use 0 as special case for the parameter 'count' to determine the string length of the binary input. Instead, use strlen() outside of the function if needed. Additionally, fix the return value and return the length of the converted string. The old function always returned 2 * count. Also, use more appropriate data types for the function parameters and add a small documentation. Change-Id: I133a8ab786b8f7c1296afcaf9c0a0b43881e5112 Signed-off-by: Marc Schink <openocd-dev@marcschink.de> Reviewed-on: http://openocd.zylin.com/3793 Tested-by: jenkins Reviewed-by: Tomas Vanek <vanekt@fbl.cz>
This commit is contained in:
committed by
Paul Fertser
parent
1461237073
commit
69ff7354d9
@@ -697,7 +697,8 @@ static int gdb_output_con(struct connection *connection, const char *line)
|
||||
return ERROR_GDB_BUFFER_TOO_SMALL;
|
||||
|
||||
hex_buffer[0] = 'O';
|
||||
int pkt_len = hexify(hex_buffer + 1, line, bin_size, bin_size * 2 + 1);
|
||||
size_t pkt_len = hexify(hex_buffer + 1, (const uint8_t *)line, bin_size,
|
||||
bin_size * 2 + 1);
|
||||
int retval = gdb_put_packet(connection, hex_buffer, pkt_len + 1);
|
||||
|
||||
free(hex_buffer);
|
||||
@@ -1407,7 +1408,7 @@ static int gdb_read_memory_packet(struct connection *connection,
|
||||
if (retval == ERROR_OK) {
|
||||
hex_buffer = malloc(len * 2 + 1);
|
||||
|
||||
int pkt_len = hexify(hex_buffer, (char *)buffer, len, len * 2 + 1);
|
||||
size_t pkt_len = hexify(hex_buffer, buffer, len, len * 2 + 1);
|
||||
|
||||
gdb_put_packet(connection, hex_buffer, pkt_len);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user