From 234fa6d16b6340b4051d8bcac143702fcb508f47 Mon Sep 17 00:00:00 2001 From: Michael Snyder Date: Mon, 14 May 2001 19:02:00 +0000 Subject: [PATCH] 2001-05-14 Michael Snyder * remote.c (hex2bin): Make first argument const. Require explicit count, don't accept null-terminated str. (remote_resume, remote_async_resume): White space fix-up. --- gdb/ChangeLog | 9 +++++++-- gdb/remote.c | 16 +++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0fbd941f36..e1088e13ef 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2001-05-14 Michael Snyder + + * remote.c (hex2bin): Make first argument const. + Require explicit count, don't accept null-terminated str. + (remote_resume, remote_async_resume): White space fix-up. + (remote_write_bytes): Set nr_bytes to return value of bin2hex. + 2001-05-13 Mark Kettenis * symtab.c (lookup_symtab_1): Use lbasename (NAME) instead of @@ -9,8 +16,6 @@ 2001-05-14 Michael Snyder * solib.c, solib.h: Add comment for function no_shared_libraries. - * remote.c (remote_write_bytes): Set nr_bytes to return value of - bin2hex. 2001-05-14 Kevin Buettner diff --git a/gdb/remote.c b/gdb/remote.c index 8ec75d2558..1f7a763e56 100644 --- a/gdb/remote.c +++ b/gdb/remote.c @@ -190,6 +190,8 @@ static int fromhex (int a); static int hex2bin (const char *hex, char *bin, int); +static int bin2hex (const char *bin, char *hex, int); + static int putpkt_binary (char *buf, int cnt); static void check_binary_download (CORE_ADDR addr); @@ -2346,10 +2348,6 @@ hex2bin (const char *hex, char *bin, int count) { int i; - /* May use a length, or a nul-terminated string as input. */ - if (count == 0) - count = strlen (hex) / 2; - for (i = 0; i < count; i++) { if (hex[0] == 0 || hex[1] == 0) @@ -2376,7 +2374,7 @@ tohex (int nib) } static int -bin2hex (char *bin, char *hex, int count) +bin2hex (const char *bin, char *hex, int count) { int i; /* May use a length, or a nul-terminated string as input. */ @@ -2449,7 +2447,7 @@ remote_resume (ptid_t ptid, int step, enum target_signal siggnal) putpkt (buf); getpkt (buf, PBUFSIZ, 0); - if (packet_ok(buf, &remote_protocol_E) == PACKET_OK) + if (packet_ok (buf, &remote_protocol_E) == PACKET_OK) return; } } @@ -2467,7 +2465,7 @@ remote_resume (ptid_t ptid, int step, enum target_signal siggnal) putpkt (buf); getpkt (buf, PBUFSIZ, 0); - if (packet_ok(buf, &remote_protocol_e) == PACKET_OK) + if (packet_ok (buf, &remote_protocol_e) == PACKET_OK) return; } } @@ -2537,7 +2535,7 @@ remote_async_resume (ptid_t ptid, int step, enum target_signal siggnal) putpkt (buf); getpkt (buf, PBUFSIZ, 0); - if (packet_ok(buf, &remote_protocol_E) == PACKET_OK) + if (packet_ok (buf, &remote_protocol_E) == PACKET_OK) goto register_event_loop; } } @@ -2555,7 +2553,7 @@ remote_async_resume (ptid_t ptid, int step, enum target_signal siggnal) putpkt (buf); getpkt (buf, PBUFSIZ, 0); - if (packet_ok(buf, &remote_protocol_e) == PACKET_OK) + if (packet_ok (buf, &remote_protocol_e) == PACKET_OK) goto register_event_loop; } }