summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2002-08-29 09:44:23 +0000
committerJim Meyering <jim@meyering.net>2002-08-29 09:44:23 +0000
commit82c0b315bcbfea3935919bc7861dad668f36280c (patch)
treec87f4463a05a96464028d6582c977386ff8a6764
parent9a9e0503a26a2076caa48422cbcc6ae02aeb3721 (diff)
downloadcoreutils-82c0b315bcbfea3935919bc7861dad668f36280c.tar.xz
(print_dir): Rename local variable: reading -> dirp.
-rw-r--r--src/ls.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/ls.c b/src/ls.c
index 13602af2b..7b2dd50f1 100644
--- a/src/ls.c
+++ b/src/ls.c
@@ -2030,14 +2030,14 @@ queue_directory (const char *name, const char *realname)
static void
print_dir (const char *name, const char *realname)
{
- register DIR *reading;
+ register DIR *dirp;
register struct dirent *next;
register uintmax_t total_blocks = 0;
static int first = 1;
errno = 0;
- reading = opendir (name);
- if (!reading)
+ dirp = opendir (name);
+ if (!dirp)
{
error (0, errno, "%s", quotearg_colon (name));
exit_status = 1;
@@ -2047,7 +2047,7 @@ print_dir (const char *name, const char *realname)
if (LOOP_DETECT)
{
struct stat dir_stat;
- int fd = dirfd (reading);
+ int fd = dirfd (dirp);
/* If dirfd failed, endure the overhead of using stat. */
if ((0 <= fd
@@ -2077,7 +2077,7 @@ print_dir (const char *name, const char *realname)
clear_files ();
- while ((next = readdir (reading)) != NULL)
+ while ((next = readdir (dirp)) != NULL)
if (file_interesting (next))
{
enum filetype type = unknown;
@@ -2091,7 +2091,7 @@ print_dir (const char *name, const char *realname)
total_blocks += gobble_file (next->d_name, type, 0, name);
}
- if (CLOSEDIR (reading))
+ if (CLOSEDIR (dirp))
{
error (0, errno, "%s", quotearg_colon (name));
exit_status = 1;