summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFernando Nasser <fnasser@redhat.com>2000-10-25 14:19:38 +0000
committerFernando Nasser <fnasser@redhat.com>2000-10-25 14:19:38 +0000
commita82f4c145312862a73f18cef2434ac05379bbc37 (patch)
tree3c173c959cff59953c1b94b53a9abc456160bb21
parentaaf822285b21d73562a769a86772359f4fe0496f (diff)
downloadgdb-a82f4c145312862a73f18cef2434ac05379bbc37.tar.gz
2000-10-25 Fernando Nasser <fnasser@cygnus.com>
* ser-unix.c (do_unix_readchar): Coding style improvement only.
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/ser-unix.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index cb488c5b898..77949b3a186 100644
--- 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 73555b27a0a..a6c7b045551 100644
--- 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. */