summaryrefslogtreecommitdiff
path: root/src/ls.c
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>1998-06-29 15:59:39 +0000
committerJim Meyering <jim@meyering.net>1998-06-29 15:59:39 +0000
commit83d4b736d21720106b2d63858ecdf0a5ceb80b01 (patch)
tree04ebf3711803a178bd3adcb600b814ba65eb1403 /src/ls.c
parent257c5c4737ce0399316199903ae402ae9e794a84 (diff)
downloadcoreutils-83d4b736d21720106b2d63858ecdf0a5ceb80b01.tar.xz
revert back to using lower case _unlocked wrapper names
Diffstat (limited to 'src/ls.c')
-rw-r--r--src/ls.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/ls.c b/src/ls.c
index d02850933..fe37c2a01 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -566,7 +566,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) \
@@ -2131,7 +2131,7 @@ print_current_files (void)
for (i = 0; i < files_index; i++)
{
print_file_name_and_frills (files + i);
- PUTCHAR ('\n');
+ putchar ('\n');
}
break;
@@ -2366,7 +2366,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;
}
@@ -2533,7 +2533,7 @@ put_indicator (const struct bin_str *ind)
p = ind->string;
for (i = ind->len; i > 0; --i)
- PUTCHAR (*(p++));
+ putchar (*(p++));
}
static int
@@ -2651,7 +2651,7 @@ print_many_per_line (void)
indent (pos + name_length, pos + max_name_length);
pos += max_name_length;
}
- PUTCHAR ('\n');
+ putchar ('\n');
}
}
@@ -2720,7 +2720,7 @@ print_horizontal (void)
if (col == 0)
{
- PUTCHAR ('\n');
+ putchar ('\n');
pos = 0;
}
else
@@ -2734,7 +2734,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
@@ -2755,18 +2755,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.
@@ -2779,12 +2779,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++;
}
}