* 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.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ed2abe5992607ec5ce5601fc037ce801aa3bc464..21d2bc4a5ba754827c071de8cfbdaf36793172ec 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -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".

diff --git a/gdb/ser-base.c b/gdb/ser-base.c
index f0f5b575dfb78dc84da418e954ce165be026b6b8..8fdfd254611dcf062b01540402a35371288ad38e 100644 (file)
--- a/gdb/ser-base.c
+++ b/gdb/ser-base.c
@@ -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;    

diff --git a/gdb/serial.h b/gdb/serial.h
index 1fc502b670ef0b75b85965925c833a58a971e798..426042999ac4d5307c21fdeb511da97c0d6ffe37 100644 (file)
--- a/gdb/serial.h
+++ b/gdb/serial.h
@@ -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.  */