drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use fii instead of fai for FILE_INTERNAL_INFORMATION vars 

* fhandler_disk_file.cc (path_conv::get_ino_by_handle): Rename fai to
        fii for clearness.
        (fhandler_disk_file::readdir): Ditto.

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen 2015-12-09 23:51:48 +01:00
parent 3da81956e2
commit ab73edc056
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,9 @@
2015-12-10 Corinna Vinschen <corinna@vinschen.de>
* fhandler_disk_file.cc (path_conv::get_ino_by_handle): Rename fai to
fii for clearness.
(fhandler_disk_file::readdir): Ditto.
2015-12-09 Corinna Vinschen <corinna@vinschen.de> 2015-12-09 Corinna Vinschen <corinna@vinschen.de>
* ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId * ntdll.h (FILE_ID_BOTH_DIR_INFORMATION): Revert IndexNumber to FileId

16
winsup/cygwin/fhandler_disk_file.cc
View File

@ -224,12 +224,12 @@ inline ino_t
path_conv::get_ino_by_handle (HANDLE hdl) path_conv::get_ino_by_handle (HANDLE hdl)
{ {
IO_STATUS_BLOCK io; IO_STATUS_BLOCK io;
FILE_INTERNAL_INFORMATION fai; FILE_INTERNAL_INFORMATION fii;
if (NT_SUCCESS (NtQueryInformationFile (hdl, &io, &fai, sizeof fai, if (NT_SUCCESS (NtQueryInformationFile (hdl, &io, &fii, sizeof fii,
FileInternalInformation)) FileInternalInformation))
&& isgood_inode (fai.IndexNumber.QuadPart)) && isgood_inode (fii.IndexNumber.QuadPart))
return fai.IndexNumber.QuadPart; return fii.IndexNumber.QuadPart;
return 0; return 0;
} }
@ -2407,14 +2407,14 @@ go_ahead:
/* We call NtQueryInformationFile here, rather than /* We call NtQueryInformationFile here, rather than
pc.get_ino_by_handle(), otherwise we can't short-circuit pc.get_ino_by_handle(), otherwise we can't short-circuit
dirent_set_d_ino correctly. */ dirent_set_d_ino correctly. */
FILE_INTERNAL_INFORMATION fai; FILE_INTERNAL_INFORMATION fii;
f_status = NtQueryInformationFile (hdl, &io, &fai, sizeof fai, f_status = NtQueryInformationFile (hdl, &io, &fii, sizeof fii,
FileInternalInformation); FileInternalInformation);
NtClose (hdl); NtClose (hdl);
if (NT_SUCCESS (f_status)) if (NT_SUCCESS (f_status))
{ {
if (pc.isgood_inode (fai.IndexNumber.QuadPart)) if (pc.isgood_inode (fii.IndexNumber.QuadPart))
de->d_ino = fai.IndexNumber.QuadPart; de->d_ino = fii.IndexNumber.QuadPart;
else else
/* Untrusted file system. Don't try to fetch inode /* Untrusted file system. Don't try to fetch inode
number again. */ number again. */