mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Issue #23152: Renames time_t_to_FILE_TIME to _Py_time_t_to_FILE_TIME, removes unused struct win32_stat and return value

Browse source
This commit is contained in:
Steve Dower 2015-02-21 15:26:02 -08:00
parent a2af1a5a5a
commit bf1f376b3e
2 changed files with 6 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Modules/posixmodule.c
View file

@ -1451,24 +1451,6 @@ win32_wchdir(LPCWSTR path)
#define HAVE_STAT_NSEC 1 #define HAVE_STAT_NSEC 1
#define HAVE_STRUCT_STAT_ST_FILE_ATTRIBUTES 1 #define HAVE_STRUCT_STAT_ST_FILE_ATTRIBUTES 1
struct win32_stat{
unsigned long st_dev;
__int64 st_ino;
unsigned short st_mode;
int st_nlink;
int st_uid;
int st_gid;
unsigned long st_rdev;
__int64 st_size;
time_t st_atime;
int st_atime_nsec;
time_t st_mtime;
int st_mtime_nsec;
time_t st_ctime;
int st_ctime_nsec;
unsigned long st_file_attributes;
};
static BOOL static BOOL
attributes_from_dir(LPCSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *reparse_tag) attributes_from_dir(LPCSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *reparse_tag)
{ {
@ -1579,7 +1561,7 @@ get_target_path(HANDLE hdl, wchar_t **target_path)
} }
/* defined in fileutils.c */ /* defined in fileutils.c */
int void
_Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag, struct _Py_stat_struct *result); _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag, struct _Py_stat_struct *result);
static int static int
@ -6221,7 +6203,7 @@ exit:
#ifdef MS_WINDOWS #ifdef MS_WINDOWS
void void
time_t_to_FILE_TIME(time_t time_in, int nsec_in, FILETIME *out_ptr); _Py_time_t_to_FILE_TIME(time_t time_in, int nsec_in, FILETIME *out_ptr);
#endif #endif
static PyObject * static PyObject *
@ -6327,8 +6309,8 @@ os_utime_impl(PyModuleDef *module, path_t *path, PyObject *times, PyObject *ns,
atime = mtime; atime = mtime;
} }
else { else {
time_t_to_FILE_TIME(utime.atime_s, utime.atime_ns, &atime); _Py_time_t_to_FILE_TIME(utime.atime_s, utime.atime_ns, &atime);
time_t_to_FILE_TIME(utime.mtime_s, utime.mtime_ns, &mtime); _Py_time_t_to_FILE_TIME(utime.mtime_s, utime.mtime_ns, &mtime);
} }
if (!SetFileTime(hFile, NULL, &atime, &mtime)) { if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
/* Avoid putting the file name into the error here, /* Avoid putting the file name into the error here,

6
Python/fileutils.c
View file

@ -563,7 +563,7 @@ FILE_TIME_to_time_t_nsec(FILETIME *in_ptr, time_t *time_out, int* nsec_out)
} }
void void
time_t_to_FILE_TIME(time_t time_in, int nsec_in, FILETIME *out_ptr) _Py_time_t_to_FILE_TIME(time_t time_in, int nsec_in, FILETIME *out_ptr)
{ {
/* XXX endianness */ /* XXX endianness */
__int64 out; __int64 out;
@ -591,7 +591,7 @@ attributes_to_mode(DWORD attr)
return m; return m;
} }
int void
_Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag, struct _Py_stat_struct *result) _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag, struct _Py_stat_struct *result)
{ {
memset(result, 0, sizeof(*result)); memset(result, 0, sizeof(*result));
@ -611,8 +611,6 @@ _Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag,
result->st_mode |= S_IFLNK; result->st_mode |= S_IFLNK;
} }
result->st_file_attributes = info->dwFileAttributes; result->st_file_attributes = info->dwFileAttributes;
return 0;
} }
#endif #endif