diff options
| author | Jim Meyering <jim@meyering.net> | 1998-06-29 02:11:07 +0000 |
|---|---|---|
| committer | Jim Meyering <jim@meyering.net> | 1998-06-29 02:11:07 +0000 |
| commit | dd9470cb58f9c668279aa8dab8164440b73daaad (patch) | |
| tree | cf22a0d981deca2485740b4b6ec6efd6ae15793d /src/expand.c | |
| parent | 02fc5fa0d0a68fa070dcb93983ad20590e051164 (diff) | |
| download | coreutils-dd9470cb58f9c668279aa8dab8164440b73daaad.tar.xz | |
Change all uses of unlocked-wrapped functions to their upper case wrapper names.
Diffstat (limited to 'src/expand.c')
| -rw-r--r-- | src/expand.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/expand.c b/src/expand.c index a179ef892..9cda50dcb 100644 --- a/src/expand.c +++ b/src/expand.c @@ -202,14 +202,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; @@ -254,7 +254,7 @@ expand (void) return; for (;;) { - c = getc (fp); + c = GETC (fp); if (c == EOF) { fp = next_file (fp); @@ -266,7 +266,7 @@ expand (void) if (c == '\n') { - putchar (c); + PUTCHAR (c); tab_index = 0; column = 0; convert = 1; @@ -292,7 +292,7 @@ expand (void) } while (column < next_tab_column) { - putchar (' '); + PUTCHAR (' '); ++column; } } @@ -312,7 +312,7 @@ expand (void) convert = 0; } } - putchar (c); + PUTCHAR (c); } } } @@ -387,9 +387,9 @@ main (int argc, char **argv) expand (); - if (have_read_stdin && fclose (stdin) == EOF) + if (have_read_stdin && FCLOSE (stdin) == EOF) error (EXIT_FAILURE, errno, "-"); - if (ferror (stdout) || fclose (stdout) == EOF) + if (FERROR (stdout) || fclose (stdout) == EOF) error (EXIT_FAILURE, errno, _("write error")); exit (exit_status == 0 ? EXIT_SUCCESS : EXIT_FAILURE); |