CC-tea/coreutils
1
0
Fork 0
mirror of git://git.sv.gnu.org/coreutils.git synced 2026-04-12 06:57:33 +02:00
Code Issues Projects Releases Wiki Activity

(squeeze_filter, read_and_delete, read_and_xlate): Adapt to new safe_read ABI.

Browse Source
This commit is contained in:
Jim Meyering
2002-10-08 07:13:56 +00:00
parent b82563de58
commit c52b7838fa
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/tr.c
View File

@@ -1594,7 +1594,7 @@ squeeze_filter (unsigned char *buf, size_t size, Filter reader)
{
unsigned int char_to_squeeze = NOT_A_CHAR;
size_t i = 0;
ssize_t nr = 0;
size_t nr = 0;
for (;;)
{
@@ -1604,10 +1604,9 @@ squeeze_filter (unsigned char *buf, size_t size, Filter reader)
{
if (reader == NULL)
{
ssize_t signed_nr = safe_read (0, (char *) buf, size);
if (signed_nr < 0)
nr = safe_read (0, (char *) buf, size);
if (nr == SAFE_READ_ERROR)
error (EXIT_FAILURE, errno, _("read error"));
nr = signed_nr;
}
else
{
@@ -1706,9 +1705,9 @@ read_and_delete (unsigned char *buf, size_t size, Filter not_used)
do
{
size_t i;
ssize_t nr = safe_read (0, (char *) buf, size);
size_t nr = safe_read (0, (char *) buf, size);
if (nr < 0)
if (nr == SAFE_READ_ERROR)
error (EXIT_FAILURE, errno, _("read error"));
if (nr == 0)
{
@@ -1741,7 +1740,7 @@ read_and_delete (unsigned char *buf, size_t size, Filter not_used)
static size_t
read_and_xlate (unsigned char *buf, size_t size, Filter not_used)
{
ssize_t chars_read = 0;
size_t chars_read = 0;
static int hit_eof = 0;
size_t i;
@@ -1751,7 +1750,7 @@ read_and_xlate (unsigned char *buf, size_t size, Filter not_used)
return 0;
chars_read = safe_read (0, (char *) buf, size);
if (chars_read < 0)
if (chars_read == SAFE_READ_ERROR)
error (EXIT_FAILURE, errno, _("read error"));
if (chars_read == 0)
{