From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 493 invoked by alias); 20 Jan 2014 19:23:37 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 480 invoked by uid 89); 20 Jan 2014 19:23:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.2 required=5.0 tests=AWL,BAYES_00,RP_MATCHES_RCVD,SPF_HELO_PASS,SPF_PASS autolearn=ham version=3.3.2 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 20 Jan 2014 19:23:35 +0000 Received: from int-mx12.intmail.prod.int.phx2.redhat.com (int-mx12.intmail.prod.int.phx2.redhat.com [10.5.11.25]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s0KJIQh2020867 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Mon, 20 Jan 2014 14:18:27 -0500 Received: from barimba.redhat.com (ovpn-113-85.phx2.redhat.com [10.3.113.85]) by int-mx12.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s0KJINCv031799; Mon, 20 Jan 2014 14:18:26 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFC 5/9] replace hexify with bin2hex Date: Mon, 20 Jan 2014 19:23:00 -0000 Message-Id: <1390245501-1186-6-git-send-email-tromey@redhat.com> In-Reply-To: <1390245501-1186-1-git-send-email-tromey@redhat.com> References: <1390245501-1186-1-git-send-email-tromey@redhat.com> X-SW-Source: 2014-01/txt/msg00752.txt.bz2 This removes hexify in favor of bin2hex. The choice of which to keep was arbitrary. 2014-01-20 Tom Tromey * common/rsp-low.h (hexify): Don't declare. * common/rsp-low.c (hexify): Remove. 2014-01-20 Tom Tromey * remote-utils.c (look_up_one_symbol, monitor_output): Use bin2hex, not hexify. * tracepoint.c (cmd_qtstatus): Likewise. --- gdb/ChangeLog | 5 +++++ gdb/common/rsp-low.c | 14 -------------- gdb/common/rsp-low.h | 2 -- gdb/gdbserver/ChangeLog | 6 ++++++ gdb/gdbserver/remote-utils.c | 5 +++-- gdb/gdbserver/tracepoint.c | 6 +++--- 6 files changed, 17 insertions(+), 21 deletions(-) diff --git a/gdb/common/rsp-low.c b/gdb/common/rsp-low.c index feb6d0c..e288c6a 100644 --- a/gdb/common/rsp-low.c +++ b/gdb/common/rsp-low.c @@ -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) { diff --git a/gdb/common/rsp-low.h b/gdb/common/rsp-low.h index 177649a..4903cd8 100644 --- a/gdb/common/rsp-low.h +++ b/gdb/common/rsp-low.h @@ -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 diff --git a/gdb/gdbserver/remote-utils.c b/gdb/gdbserver/remote-utils.c index b2a84c3..9d0ec55 100644 --- a/gdb/gdbserver/remote-utils.c +++ b/gdb/gdbserver/remote-utils.c @@ -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); diff --git a/gdb/gdbserver/tracepoint.c b/gdb/gdbserver/tracepoint.c index 613220c..8dffe83 100644 --- a/gdb/gdbserver/tracepoint.c +++ b/gdb/gdbserver/tracepoint.c @@ -3608,17 +3608,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); -- 1.8.1.4