OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

replace hexify with bin2hex 

This removes hexify in favor of bin2hex.
The choice of which to keep was arbitrary.

2014-02-12  Tom Tromey  <tromey@redhat.com>

	* common/rsp-low.h (hexify): Don't declare.
	* common/rsp-low.c (hexify): Remove.

2014-02-12  Tom Tromey  <tromey@redhat.com>

	* remote-utils.c (look_up_one_symbol, monitor_output): Use
	bin2hex, not hexify.
	* tracepoint.c (cmd_qtstatus): Likewise.
This commit is contained in:
Tom Tromey 2014-01-18 19:30:20 -07:00
parent 0a822afbcd
commit 971dc0b89d
6 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gdb/ChangeLog
View File

@ -1,3 +1,8 @@
2014-02-12 Tom Tromey <tromey@redhat.com>
* common/rsp-low.h (hexify): Don't declare.
* common/rsp-low.c (hexify): Remove.
2014-02-12 Tom Tromey <tromey@redhat.com>
* common/rsp-low.c (hexify): Never take strlen of argument.

14
gdb/common/rsp-low.c
View File

@ -172,20 +172,6 @@ bin2hex (const gdb_byte *bin, char *hex, int count)
return i;
}
int
hexify (char *hex, const char *bin, int count)
{
int i;
for (i = 0; i < count; i++)
{
*hex++ = tohex ((*bin >> 4) & 0xf);
*hex++ = tohex (*bin++ & 0xf);
}
*hex = 0;
return i;
}
void
convert_int_to_ascii (const unsigned char *from, char *to, int n)
{

2
gdb/common/rsp-low.h
View File

@ -42,8 +42,6 @@ extern void convert_ascii_to_int (const char *from, unsigned char *to, int n);
extern int bin2hex (const gdb_byte *bin, char *hex, int count);
extern int hexify (char *hex, const char *bin, int count);
extern void convert_int_to_ascii (const unsigned char *from, char *to, int n);
/* Convert BUFFER, binary data at least LEN bytes long, into escaped

6
gdb/gdbserver/ChangeLog
View File

@ -1,3 +1,9 @@
2014-02-12 Tom Tromey <tromey@redhat.com>
* remote-utils.c (look_up_one_symbol, monitor_output): Use
bin2hex, not hexify.
* tracepoint.c (cmd_qtstatus): Likewise.
2014-02-12 Tom Tromey <tromey@redhat.com>
* remote-utils.c (monitor_output): Pass explicit length to

5
gdb/gdbserver/remote-utils.c
View File

@ -1399,7 +1399,8 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb)
/* Send the request. */
strcpy (own_buf, "qSymbol:");
hexify (own_buf + strlen ("qSymbol:"), name, strlen (name));
bin2hex ((const gdb_byte *) name, own_buf + strlen ("qSymbol:"),
strlen (name));
if (putpkt (own_buf) < 0)
return -1;
@ -1562,7 +1563,7 @@ monitor_output (const char *msg)
char *buf = xmalloc (len * 2 + 2);
buf[0] = 'O';
hexify (buf + 1, msg, len);
bin2hex ((const gdb_byte *) msg, buf + 1, len);
putpkt (buf);
free (buf);

6
gdb/gdbserver/tracepoint.c
View File

@ -3623,17 +3623,17 @@ cmd_qtstatus (char *packet)
str = (tracing_user_name ? tracing_user_name : "");
slen = strlen (str);
buf1 = (char *) alloca (slen * 2 + 1);
hexify (buf1, str, slen);
bin2hex ((gdb_byte *) str, buf1, slen);
str = (tracing_notes ? tracing_notes : "");
slen = strlen (str);
buf2 = (char *) alloca (slen * 2 + 1);
hexify (buf2, str, slen);
bin2hex ((gdb_byte *) str, buf2, slen);
str = (tracing_stop_note ? tracing_stop_note : "");
slen = strlen (str);
buf3 = (char *) alloca (slen * 2 + 1);
hexify (buf3, str, slen);
bin2hex ((gdb_byte *) str, buf3, slen);
trace_debug ("Returning trace status as %d, stop reason %s",
tracing, tracing_stop_reason);