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

        * ser-unix.c (do_unix_readchar): Coding style improvement only.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cb488c5..77949b3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,9 @@
 2000-10-25  Fernando Nasser  <fnasser@cygnus.com>
 
+       * ser-unix.c (do_unix_readchar): Coding style improvement only.
+
+2000-10-25  Fernando Nasser  <fnasser@cygnus.com>
+
         * target.c (generic_mourn_inferior): Notify GUI that inferior is gone
         by calling detach_hook, if defined.
 

diff --git a/gdb/ser-unix.c b/gdb/ser-unix.c
index 73555b2..a6c7b04 100644 (file)
--- a/gdb/ser-unix.c
+++ b/gdb/ser-unix.c
@@ -927,7 +927,8 @@ do_unix_readchar (serial_t scb, int timeout)
        }
 
       status = ser_unix_wait_for (scb, delta);
-      timeout = (timeout <= 0) ? timeout : (timeout - delta);
+      if (timeout > 0)
+        timeout -= delta;
 
       /* If we got a character or an error back from wait_for, then we can 
          break from the loop before the timeout is completed. */