[Python-checkins] cpython: Issue #23152: Renames time_t_to_FILE_TIME to _Py_time_t_to_FILE_TIME, removes
steve.dower
python-checkins at python.org
Sun Feb 22 00:30:38 CET 2015
https://hg.python.org/cpython/rev/a824c40e8fc0
changeset: 94721:a824c40e8fc0
user: Steve Dower <steve.dower at microsoft.com>
date: Sat Feb 21 15:26:02 2015 -0800
summary:
Issue #23152: Renames time_t_to_FILE_TIME to _Py_time_t_to_FILE_TIME, removes unused struct win32_stat and return value
files:
Modules/posixmodule.c | 26 ++++----------------------
Python/fileutils.c | 6 ++----
2 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1451,24 +1451,6 @@
#define HAVE_STAT_NSEC 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
attributes_from_dir(LPCSTR pszFile, BY_HANDLE_FILE_INFORMATION *info, ULONG *reparse_tag)
{
@@ -1579,7 +1561,7 @@
}
/* defined in fileutils.c */
-int
+void
_Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag, struct _Py_stat_struct *result);
static int
@@ -6221,7 +6203,7 @@
#ifdef MS_WINDOWS
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
static PyObject *
@@ -6327,8 +6309,8 @@
atime = mtime;
}
else {
- 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.atime_s, utime.atime_ns, &atime);
+ _Py_time_t_to_FILE_TIME(utime.mtime_s, utime.mtime_ns, &mtime);
}
if (!SetFileTime(hFile, NULL, &atime, &mtime)) {
/* Avoid putting the file name into the error here,
diff --git a/Python/fileutils.c b/Python/fileutils.c
--- a/Python/fileutils.c
+++ b/Python/fileutils.c
@@ -563,7 +563,7 @@
}
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 */
__int64 out;
@@ -591,7 +591,7 @@
return m;
}
-int
+void
_Py_attribute_data_to_stat(BY_HANDLE_FILE_INFORMATION *info, ULONG reparse_tag, struct _Py_stat_struct *result)
{
memset(result, 0, sizeof(*result));
@@ -611,8 +611,6 @@
result->st_mode |= S_IFLNK;
}
result->st_file_attributes = info->dwFileAttributes;
-
- return 0;
}
#endif
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list