* serial.h (struct serial_ops): Document read_prim to return zero

at EOF.
* ser-base.c (do_ser_base_readchar): Return SERIAL_EOF when
read_prim returns zero, not SERIAL_TIMEOUT.
This commit is contained in:
Jim Blandy
2007-10-12 20:14:57 +00:00
parent e03748586c
commit d41ebd5d45
3 changed files with 9 additions and 4 deletions

View File

@@ -1,3 +1,10 @@
2007-10-12 Jim Blandy <jimb@codesourcery.com>
* serial.h (struct serial_ops): Document read_prim to return zero
at EOF.
* ser-base.c (do_ser_base_readchar): Return SERIAL_EOF when
read_prim returns zero, not SERIAL_TIMEOUT.
2007-10-12 Ulrich Weigand <uweigand@de.ibm.com>
* alpha-mdebug-tdep.c: Include "gdb_string.h".

View File

@@ -279,9 +279,7 @@ do_ser_base_readchar (struct serial *scb, int timeout)
if (status <= 0)
{
if (status == 0)
/* 0 chars means timeout. (We may need to distinguish between EOF
& timeouts someday.) */
return SERIAL_TIMEOUT;
return SERIAL_EOF;
else
/* Got an error from read. */
return SERIAL_ERROR;

View File

@@ -244,7 +244,7 @@ struct serial_ops
interesting. */
void (*async) (struct serial *scb, int async_p);
/* Perform a low-level read operation, reading (at most) COUNT
bytes into SCB->BUF. */
bytes into SCB->BUF. Return zero at end of file. */
int (*read_prim)(struct serial *scb, size_t count);
/* Perform a low-level write operation, writing (at most) COUNT
bytes from BUF. */