Change all uses of unlocked-wrapped functions to their upper case wrapper names.

diff --git a/src/df.c b/src/df.c
index 53fbedf471024d4391a6134e4c188811467da566..f073262f5d4c8b8cf294d21e85bf389a64deec4a 100644 (file)
--- a/src/df.c
+++ b/src/df.c
@@ -327,7 +327,7 @@ show_dev (const char *disk, const char *mount_point, const char *fstype)
 #endif
       printf ("  %s", mount_point);
     }
-  putchar ('\n');
+  PUTCHAR ('\n');
 }
 
 /* Identify the directory, if any, that device

diff --git a/src/dircolors.c b/src/dircolors.c
index f1c0cbc6eedcda60392b0a7806f0f9a3b90a2b15..49039a8b69060af110f170f7f8bf56bb631f50f9 100644 (file)
--- a/src/dircolors.c
+++ b/src/dircolors.c
@@ -397,7 +397,7 @@ dc_parse_file (const char *filename)
 
   err = dc_parse_stream (fp, filename);
 
-  if (fp != stdin && fclose (fp) == EOF)
+  if (fp != stdin && FCLOSE (fp) == EOF)
     {
       error (0, errno, "%s", filename);
       return 1;
@@ -472,8 +472,8 @@ dircolors' internal database"));
       int i;
       for (i = 0; i < G_N_LINES; i++)
        {
-         fwrite (G_line[i], 1, G_line_length[i], stdout);
-         fputc ('\n', stdout);
+         FWRITE (G_line[i], 1, G_line_length[i], stdout);
+         FPUTC ('\n', stdout);
        }
     }
   else
@@ -513,14 +513,14 @@ dircolors' internal database"));
              suffix = "'\n";
            }
          fputs (prefix, stdout);
-         fwrite (s, 1, len, stdout);
+         FWRITE (s, 1, len, stdout);
          fputs (suffix, stdout);
        }
     }
 
   close_stdout ();
 
-  if (have_read_stdin && fclose (stdin) == EOF)
+  if (have_read_stdin && FCLOSE (stdin) == EOF)
     error (EXIT_FAILURE, errno, _("standard input"));
 
   exit (err == 0 ? EXIT_SUCCESS : EXIT_FAILURE);

diff --git a/src/du.c b/src/du.c
index b8a4c9aff03fc38de986b48ae3ff9eefbe03d358..edaf3988cc1211904470432f5137d0a86e7d8d58 100644 (file)
--- a/src/du.c
+++ b/src/du.c
@@ -425,7 +425,7 @@ print_size (uintmax_t n_blocks, const char *string)
          human_readable (n_blocks, buf, ST_NBLOCKSIZE, output_units,
                          human_readable_base),
          string);
-  fflush (stdout);
+  FFLUSH (stdout);
 }
 
 /* Recursively print the sizes of the directories (and, if selected, files)

diff --git a/src/ls.c b/src/ls.c
index bc49b07e09491958c8881260a65edcd2f1012b8e..e27d765197b821d1df6579ea27149e9bb04e2380 100644 (file)
--- a/src/ls.c
+++ b/src/ls.c
@@ -569,7 +569,7 @@ static char const *const time_args[] =
    and later output themselves.  */
 static size_t dired_pos;
 
-#define DIRED_PUTCHAR(c) do {putchar ((c)); ++dired_pos;} while (0)
+#define DIRED_PUTCHAR(c) do {PUTCHAR ((c)); ++dired_pos;} while (0)
 
 /* Write S to STREAM and increment DIRED_POS by S_LEN.  */
 #define DIRED_FPUTS(s, stream, s_len) \
@@ -2139,7 +2139,7 @@ print_current_files (void)
       for (i = 0; i < files_index; i++)
        {
          print_file_name_and_frills (files + i);
-         putchar ('\n');
+         PUTCHAR ('\n');
        }
       break;
 
@@ -2375,7 +2375,7 @@ quote_name (FILE *out, const char *p, struct quoting_options const *options)
          buf[i] = '?';
     }
 
-  fwrite (buf, 1, len, out);
+  FWRITE (buf, 1, len, out);
   return len;
 }
 
@@ -2542,7 +2542,7 @@ put_indicator (const struct bin_str *ind)
   p = ind->string;
 
   for (i = ind->len; i > 0; --i)
-    putchar (*(p++));
+    PUTCHAR (*(p++));
 }
 
 static int
@@ -2660,7 +2660,7 @@ print_many_per_line (void)
          indent (pos + name_length, pos + max_name_length);
          pos += max_name_length;
        }
-      putchar ('\n');
+      PUTCHAR ('\n');
     }
 }
 
@@ -2729,7 +2729,7 @@ print_horizontal (void)
 
       if (col == 0)
        {
-         putchar ('\n');
+         PUTCHAR ('\n');
          pos = 0;
        }
       else
@@ -2743,7 +2743,7 @@ print_horizontal (void)
       name_length = length_of_file_name_and_frills (files + filesno);
       max_name_length = line_fmt->col_arr[col];
     }
-  putchar ('\n');
+  PUTCHAR ('\n');
 }
 
 static void
@@ -2764,18 +2764,18 @@ print_with_commas (void)
 
       if (old_pos != 0 && pos >= line_length)
        {
-         putchar ('\n');
+         PUTCHAR ('\n');
          pos -= old_pos;
        }
 
       print_file_name_and_frills (files + filesno);
       if (filesno + 1 < files_index)
        {
-         putchar (',');
-         putchar (' ');
+         PUTCHAR (',');
+         PUTCHAR (' ');
        }
     }
-  putchar ('\n');
+  PUTCHAR ('\n');
 }
 
 /* Assuming cursor is at position FROM, indent up to position TO.
@@ -2788,12 +2788,12 @@ indent (int from, int to)
     {
       if (tabsize > 0 && to / tabsize > (from + 1) / tabsize)
        {
-         putchar ('\t');
+         PUTCHAR ('\t');
          from += tabsize - from % tabsize;
        }
       else
        {
-         putchar (' ');
+         PUTCHAR (' ');
          from++;
        }
     }

diff --git a/src/remove.c b/src/remove.c
index 7a6585bd10e593c69531f76aafa3de10467d26eb..99337ad555625515e1f5686a1f234fb8957bc0e2 100644 (file)
--- a/src/remove.c
+++ b/src/remove.c
@@ -155,7 +155,7 @@ print_nth_dir (FILE *stream, unsigned int depth)
       sum += length[i];
     }
 
-  fwrite (dir_name, 1, sum, stream);
+  FWRITE (dir_name, 1, sum, stream);
 }
 
 static inline struct active_dir_ent *
@@ -801,10 +801,10 @@ NOTIFY YOUR SYSTEM MANAGER.\n\
 The following two directories have the same inode number:\n"));
          /* FIXME: test this!!  */
          print_nth_dir (stderr, current_depth ());
-         fputc ('\n', stderr);
+         FPUTC ('\n', stderr);
          print_nth_dir (stderr, old_ent->depth);
-         fputc ('\n', stderr);
-         fflush (stderr);
+         FPUTC ('\n', stderr);
+         FFLUSH (stderr);
 
          free (old_ent);