From ca9271d1b6c70a60640e32a2cdb729d51e2037e7 Mon Sep 17 00:00:00 2001 From: Christopher Faylor Date: Mon, 19 Dec 2005 04:00:41 +0000 Subject: * 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. --- winsup/cygwin/dir.cc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'winsup/cygwin/dir.cc') 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; } -- cgit v1.2.3