drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* fhandler_tape.cc (fhandler_dev_tape::raw_read): Use ?: instead of 

if/else.
	(fhandler_dev_tape::raw_write): Return -1 in case of error.
This commit is contained in:
Corinna Vinschen 2004-08-20 13:40:35 +00:00
parent b9188d6c1e
commit 7c48171279
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -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> 2004-08-19 Corinna Vinschen <corinna@vinschen.de>
* errno.cc (_sys_errlist): Change various text to their english Linux * errno.cc (_sys_errlist): Change various text to their english Linux

7
winsup/cygwin/fhandler_tape.cc
View File

@ -1350,10 +1350,7 @@ fhandler_dev_tape::raw_read (void *ptr, size_t &ulen)
lastblk_to_read (true); lastblk_to_read (true);
} }
} }
if (ret) ulen = (ret ? (size_t) -1 : bytes_read);
ulen = (size_t) -1;
else
ulen = bytes_read;
unlock (); 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); int ret = mt->drive (driveno ())->write (get_handle (), mt_evt, ptr, len);
if (ret) if (ret)
__seterrno_from_win_error (ret); __seterrno_from_win_error (ret);
return unlock (len); return unlock (ret ? -1 : (int) len);
} }
_off64_t _off64_t