[PATCH] Cygwin: dll_list: drop unused read_fbi method

Ken Brown kbrown@cornell.edu
Sun May 5 14:16:00 GMT 2019


On 5/2/2019 4:05 AM, Michael Haubenwallner wrote:
> ---
>   winsup/cygwin/dll_init.h  |  1 -
>   winsup/cygwin/forkable.cc | 23 -----------------------
>   2 files changed, 24 deletions(-)
> 
> diff --git a/winsup/cygwin/dll_init.h b/winsup/cygwin/dll_init.h
> index e4fbde867..3c274cf35 100644
> --- a/winsup/cygwin/dll_init.h
> +++ b/winsup/cygwin/dll_init.h
> @@ -119,7 +119,6 @@ public:
>   			    ULONG openopts = 0, ACCESS_MASK access = 0,
>   			    HANDLE rootDir = NULL);
>     static bool read_fii (HANDLE fh, PFILE_INTERNAL_INFORMATION pfii);
> -  static bool read_fbi (HANDLE fh, PFILE_BASIC_INFORMATION pfbi);
>     static PWCHAR form_ntname (PWCHAR ntbuf, size_t bufsize, PCWCHAR name);
>     static PWCHAR form_shortname (PWCHAR shortbuf, size_t bufsize, PCWCHAR name);
>     static PWCHAR nt_max_path_buf ()
> diff --git a/winsup/cygwin/forkable.cc b/winsup/cygwin/forkable.cc
> index e78784c2f..1dcafe5e1 100644
> --- a/winsup/cygwin/forkable.cc
> +++ b/winsup/cygwin/forkable.cc
> @@ -268,29 +268,6 @@ dll_list::read_fii (HANDLE fh, PFILE_INTERNAL_INFORMATION pfii)
>     return true;
>   }
>   
> -bool
> -dll_list::read_fbi (HANDLE fh, PFILE_BASIC_INFORMATION pfbi)
> -{
> -  pfbi->FileAttributes = INVALID_FILE_ATTRIBUTES;
> -  pfbi->LastWriteTime.QuadPart = -1LL;
> -
> -  NTSTATUS status;
> -  IO_STATUS_BLOCK iosb;
> -  status = NtQueryInformationFile (fh, &iosb,
> -				   pfbi, sizeof (*pfbi),
> -				   FileBasicInformation);
> -  if (!NT_SUCCESS (status))
> -    {
> -      system_printf ("WARNING: %y = NtQueryInformationFile (%p,"
> -		     " BasicInfo, io.Status %y)",
> -		     status, fh, iosb.Status);
> -      pfbi->FileAttributes = INVALID_FILE_ATTRIBUTES;
> -      pfbi->LastWriteTime.QuadPart = -1LL;
> -      return false;
> -    }
> -  return true;
> -}
> -
>   /* Into buf if not NULL, write the IndexNumber in pli.
>      Return the number of characters (that would be) written. */
>   static int
> 

Pushed.

Thanks,
Ken



More information about the Cygwin-patches mailing list