Simplification 1

Author: thexai

Modules/posixmodule.c

@@ -2046,7 +2046,7 @@ find_data_to_file_info(WIN32_FIND_DATAW *pFileData,
 }
 
 static BOOL
-attributes_from_dir(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION* info, ULONG *reparse_tag, struct _Py_stat_struct* result)
+attributes_from_dir(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *reparse_tag)
 {
     HANDLE hFindFile;
     WIN32_FIND_DATAW FileData;
@@ -2077,12 +2077,7 @@ attributes_from_dir(LPCWSTR pszFile, BY_HANDLE_FILE_INFORMATION* info, ULONG *re
         return FALSE;
     }
     FindClose(hFindFile);
-
-#ifdef MS_WINDOWS_DESKTOP
     find_data_to_file_info(&FileData, info, reparse_tag);
-#else
-    _Py_find_data_to_stat(&FileData, result);
-#endif
     return TRUE;
 }
 
@@ -2140,7 +2135,7 @@ win32_xstat_slow_impl(const wchar_t *path, struct _Py_stat_struct *result,
         case ERROR_ACCESS_DENIED:     /* Cannot sync or read attributes. */
         case ERROR_SHARING_VIOLATION: /* It's a paging file. */
             /* Try reading the parent directory. */
-            if (!attributes_from_dir(path, &fileInfo, &tagInfo.ReparseTag, result)) {
+            if (!attributes_from_dir(path, &fileInfo, &tagInfo.ReparseTag)) {
                 /* Cannot read the parent directory. */
                 switch (GetLastError()) {
                 case ERROR_FILE_NOT_FOUND: /* File cannot be found */
@@ -2156,11 +2151,7 @@ win32_xstat_slow_impl(const wchar_t *path, struct _Py_stat_struct *result,
                 return -1;
             }
 
-#ifdef MS_WINDOWS_DESKTOP
             if (fileInfo.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-#else
-            if (result->st_file_attributes & FILE_ATTRIBUTE_REPARSE_POINT) {
-#endif
                 if (traverse ||
                     !IsReparseTagNameSurrogate(tagInfo.ReparseTag)) {
                     /* The stat call has to traverse but cannot, so fail. */
@@ -16721,14 +16712,10 @@ DirEntry_from_find_data(PyObject *module, path_t *path, WIN32_FIND_DATAW *dataW)
             goto error;
     }
 
-#ifdef MS_WINDOWS_DESKTOP
     BY_HANDLE_FILE_INFORMATION file_info;
     ULONG reparse_tag;
     find_data_to_file_info(dataW, &file_info, &reparse_tag);
     _Py_attribute_data_to_stat(&file_info, reparse_tag, NULL, NULL, &entry->win32_lstat);
-#else
-    _Py_find_data_to_stat(dataW, &entry->win32_lstat);
-#endif
 
     /* ctime is only deprecated from 3.12, so we copy birthtime across */
     entry->win32_lstat.st_ctime = entry->win32_lstat.st_birthtime;

Python/fileutils.c

@@ -1243,29 +1243,6 @@ _Py_stat_basic_info_to_stat(FILE_STAT_BASIC_INFORMATION *info,
     }
 }
 
-void
-_Py_find_data_to_stat(WIN32_FIND_DATAW* find_data, struct _Py_stat_struct* result)
-{
-    memset(result, 0, sizeof(*result));
-    result->st_mode = attributes_to_mode(find_data->dwFileAttributes);
-    FILE_TIME_to_time_t_nsec(&find_data->ftCreationTime, &result->st_ctime, &result->st_ctime_nsec);
-    FILE_TIME_to_time_t_nsec(&find_data->ftLastWriteTime, &result->st_mtime, &result->st_mtime_nsec);
-    FILE_TIME_to_time_t_nsec(&find_data->ftLastAccessTime, &result->st_atime, &result->st_atime_nsec);
-    result->st_size = (((long long)find_data->nFileSizeHigh) << 32) | find_data->nFileSizeLow;
-
-    if (find_data->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT)
-        result->st_reparse_tag = find_data->dwReserved0;
-
-    if (find_data->dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT &&
-        find_data->dwReserved0 == IO_REPARSE_TAG_SYMLINK) {
-        /* first clear the S_IFMT bits */
-        result->st_mode ^= (result->st_mode & S_IFMT);
-        /* now set the bits that make this a symlink */
-        result->st_mode |= S_IFLNK;
-    }
-    result->st_file_attributes = find_data->dwFileAttributes;
-}
-
 #endif
 
 /* Return information about a file.