2000-10-13 Fernando Nasser <fnasser@cygnus.com>

* remote.c (putpkt_binary): Call read_frame, not getpkt. Log message.
	(read_frame): Do not call error() on communication error when
	reading checksum, but return failure instead and log message.
This commit is contained in:
Fernando Nasser 2000-10-13 21:41:21 +00:00
parent a80aa921bf
commit 40e3f985d2
2 changed files with 14 additions and 2 deletions

View File

@ -1,3 +1,9 @@
2000-10-13 Fernando Nasser <fnasser@cygnus.com>
* remote.c (putpkt_binary): Call read_frame, not getpkt. Log message.
(read_frame): Do not call error() on communication error when
reading checksum, but return failure instead and log message.
2000-10-13 Fernando Nasser <fnasser@totem.to.cygnus.com> 2000-10-13 Fernando Nasser <fnasser@totem.to.cygnus.com>
* varobj.c (type_changeable): Arrays are not changeable. * varobj.c (type_changeable): Arrays are not changeable.

View File

@ -3796,9 +3796,11 @@ putpkt_binary (char *buf, int cnt)
break; /* Retransmit buffer */ break; /* Retransmit buffer */
case '$': case '$':
{ {
if (remote_debug)
fprintf_unfiltered (gdb_stdlog, "Packet instead of Ack, ignoring it\n");
/* It's probably an old response, and we're out of sync. /* It's probably an old response, and we're out of sync.
Just gobble up the packet and ignore it. */ Just gobble up the packet and ignore it. */
getpkt (junkbuf, sizeof_junkbuf, 0); read_frame (junkbuf, sizeof_junkbuf);
continue; /* Now, go look for + */ continue; /* Now, go look for + */
} }
default: default:
@ -3887,7 +3889,11 @@ read_frame (char *buf,
return -1; return -1;
} }
else if (check_0 < 0 || check_1 < 0) else if (check_0 < 0 || check_1 < 0)
error ("Communication error in checksum"); {
if (remote_debug)
fputs_filtered ("Communication error in checksum\n", gdb_stdlog);
return -1;
}
pktcsum = (fromhex (check_0) << 4) | fromhex (check_1); pktcsum = (fromhex (check_0) << 4) | fromhex (check_1);
if (csum == pktcsum) if (csum == pktcsum)