diff options
Diffstat (limited to 'src/unexpand.c')
| -rw-r--r-- | src/unexpand.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/unexpand.c b/src/unexpand.c index ff12b25a8..42df105dd 100644 --- a/src/unexpand.c +++ b/src/unexpand.c @@ -175,14 +175,14 @@ next_file (FILE *fp) if (fp) { - if (FERROR (fp)) + if (ferror (fp)) { error (0, errno, "%s", prev_file); exit_status = 1; } if (fp == stdin) - CLEARERR (fp); /* Also clear EOF. */ - else if (FCLOSE (fp) == EOF) + clearerr (fp); /* Also clear EOF. */ + else if (fclose (fp) == EOF) { error (0, errno, "%s", prev_file); exit_status = 1; @@ -231,7 +231,7 @@ unexpand (void) for (;;) { - c = GETC (fp); + c = getc (fp); if (c == ' ' && convert) { @@ -270,7 +270,7 @@ unexpand (void) then print the rest as spaces. */ if (pending == 1) { - PUTCHAR (' '); + putchar (' '); pending = 0; } column -= pending; @@ -293,7 +293,7 @@ unexpand (void) } if (next_tab_column - column <= pending) { - PUTCHAR ('\t'); + putchar ('\t'); pending -= next_tab_column - column; column = next_tab_column; } @@ -303,7 +303,7 @@ unexpand (void) column += pending; while (pending != 0) { - PUTCHAR (' '); + putchar (' '); pending--; } } @@ -333,7 +333,7 @@ unexpand (void) } } - PUTCHAR (c); + putchar (c); if (c == '\n') { @@ -450,9 +450,9 @@ main (int argc, char **argv) unexpand (); - if (have_read_stdin && FCLOSE (stdin) == EOF) + if (have_read_stdin && fclose (stdin) == EOF) error (EXIT_FAILURE, errno, "-"); - if (FCLOSE (stdout) == EOF) + if (fclose (stdout) == EOF) error (EXIT_FAILURE, errno, _("write error")); exit (exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } |