Welcome to mirror list, hosted at ThFree Co, Russian Federation.

cygwin.com/git/newlib-cygwin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Faylor <me@cgf.cx>2005-12-19 07:00:41 +0300
committerChristopher Faylor <me@cgf.cx>2005-12-19 07:00:41 +0300
commitca9271d1b6c70a60640e32a2cdb729d51e2037e7 (patch)
treedf73e4e96c28d32d494a04aa7f520e2e5b9a98d7 /winsup/cygwin/dir.cc
parentad02bb70e389235036436b8d3f3983b0cd5c1320 (diff)
* include/sys/dirent.h: Change __deprecated_d_ino to __invalid_d_ino throughout
to make things a little clearer. * dir.cc (readdir_worker): Reflect above change.
Diffstat (limited to 'winsup/cygwin/dir.cc')
-rw-r--r--winsup/cygwin/dir.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index a5ac1a2df..7682233df 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -103,18 +103,18 @@ readdir_worker (DIR *dir, dirent *de)
if (!res)
if (!CYGWIN_VERSION_CHECK_FOR_NEEDS_D_INO)
{
- de->__deprecated_d_ino = 0;
+ de->__invalid_d_ino = 0;
de->__ino32 = 0;
}
else
{
- /* Compute __deprecated_d_ino by combining filename hash with the directory hash
+ /* Compute __invalid_d_ino by combining filename hash with the directory hash
(which was stored in dir->__d_dirhash when opendir was called). */
if (de->d_name[0] == '.')
{
if (de->d_name[1] == '\0')
{
- de->__deprecated_d_ino = dir->__d_dirhash;
+ de->__invalid_d_ino = dir->__d_dirhash;
dir->__flags |= dirent_saw_dot;
}
else if (de->d_name[1] != '.' || de->d_name[2] != '\0')
@@ -128,11 +128,11 @@ readdir_worker (DIR *dir, dirent *de)
goto hashit;
*p = '\0';
if (!(p = strrchr (up, '\\')))
- de->__deprecated_d_ino = hash_path_name (0, ".");
+ de->__invalid_d_ino = hash_path_name (0, ".");
else
{
*p = '\0';
- de->__deprecated_d_ino = hash_path_name (0, up);
+ de->__invalid_d_ino = hash_path_name (0, up);
}
}
}
@@ -140,9 +140,9 @@ readdir_worker (DIR *dir, dirent *de)
{
hashit:
__ino64_t dino = hash_path_name (dir->__d_dirhash, "\\");
- de->__deprecated_d_ino = hash_path_name (dino, de->d_name);
+ de->__invalid_d_ino = hash_path_name (dino, de->d_name);
}
- de->__ino32 = de->__deprecated_d_ino; // for legacy applications
+ de->__ino32 = de->__invalid_d_ino; // for legacy applications
}
return res;
}