diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index c14c12ec6..03fcb33c6 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2004-08-20  Corinna Vinschen  <corinna@vinschen.de>
+
+	* fhandler_tape.cc (fhandler_dev_tape::raw_read): Use ?: instead of
+	if/else.
+	(fhandler_dev_tape::raw_write): Return -1 in case of error.
+
 2004-08-19  Corinna Vinschen  <corinna@vinschen.de>
 
 	* errno.cc (_sys_errlist): Change various text to their english Linux
diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc
index 1e31ee1b0..c86b0f400 100644
--- a/winsup/cygwin/fhandler_tape.cc
+++ b/winsup/cygwin/fhandler_tape.cc
@@ -1350,10 +1350,7 @@ fhandler_dev_tape::raw_read (void *ptr, size_t &ulen)
 	    lastblk_to_read (true);
 	}
     }
-  if (ret)
-    ulen = (size_t) -1;
-  else
-    ulen = bytes_read;
+  ulen = (ret ? (size_t) -1 : bytes_read);
   unlock ();
 }
 
@@ -1366,7 +1363,7 @@ fhandler_dev_tape::raw_write (const void *ptr, size_t len)
   int ret = mt->drive (driveno ())->write (get_handle (), mt_evt, ptr, len);
   if (ret)
     __seterrno_from_win_error (ret);
-  return unlock (len);
+  return unlock (ret ? -1 : (int) len);
 }
 
 _off64_t