diff options
| author | Corinna Vinschen <corinna@vinschen.de> | 2005-09-30 15:02:47 +0400 |
|---|---|---|
| committer | Corinna Vinschen <corinna@vinschen.de> | 2005-09-30 15:02:47 +0400 |
| commit | 3c92c79b8428c468105c92a978f8baf9a416b5c8 (patch) | |
| tree | 106f1ad2cbe236c91962cfc897feb9f738031ac0 | |
| parent | 8afc05fa903cb331003bc498b7c6b02e643871df (diff) | |
* fhandler_disk_file.cc: Change calls to pc.set_attributes into
calls to pc.file_attributes throughout.
* path.h (class path_conv): Remove superfluous set_attributes method.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 6 | ||||
| -rw-r--r-- | winsup/cygwin/fhandler_disk_file.cc | 6 | ||||
| -rw-r--r-- | winsup/cygwin/path.h | 1 |
3 files changed, 9 insertions, 4 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index d41f5dfd3..3ddd1c4a2 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,5 +1,11 @@ 2005-09-30 Corinna Vinschen <corinna@vinschen.de> + * fhandler_disk_file.cc: Change calls to pc.set_attributes into + calls to pc.file_attributes throughout. + * path.h (class path_conv): Remove superfluous set_attributes method. + +2005-09-30 Corinna Vinschen <corinna@vinschen.de> + * fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Use fhandler method to access majoer device number. Add comment to explain floppy weirdness. diff --git a/winsup/cygwin/fhandler_disk_file.cc b/winsup/cygwin/fhandler_disk_file.cc index fcd7c9cdb..960e0f8ff 100644 --- a/winsup/cygwin/fhandler_disk_file.cc +++ b/winsup/cygwin/fhandler_disk_file.cc @@ -128,7 +128,7 @@ fhandler_base::fstat_by_handle (struct __stat64 *buf) /* If the change time is 0, it's a file system which doesn't support a change timestamp. In that case use the LastWriteTime entry, as in other calls to fstat_helper. */ - pc.set_attributes (pfai->BasicInformation.FileAttributes); + pc.file_attributes (pfai->BasicInformation.FileAttributes); return fstat_helper (buf, pfai->BasicInformation.ChangeTime.QuadPart ? *(FILETIME *) &pfai->BasicInformation.ChangeTime : @@ -165,7 +165,7 @@ fhandler_base::fstat_by_handle (struct __stat64 *buf) local.dwFileAttributes = DWORD (pc); } else - pc.set_attributes (local.dwFileAttributes); + pc.file_attributes (local.dwFileAttributes); return fstat_helper (buf, local.ftLastWriteTime, /* see fstat_helper comment */ local.ftLastAccessTime, @@ -196,7 +196,7 @@ fhandler_base::fstat_by_name (struct __stat64 *buf) else if ((handle = FindFirstFile (pc, &local)) != INVALID_HANDLE_VALUE) { FindClose (handle); - pc.set_attributes (local.dwFileAttributes); + pc.file_attributes (local.dwFileAttributes); res = fstat_helper (buf, local.ftLastWriteTime, /* see fstat_helper comment */ local.ftLastAccessTime, diff --git a/winsup/cygwin/path.h b/winsup/cygwin/path.h index c35358566..aeb70c0f8 100644 --- a/winsup/cygwin/path.h +++ b/winsup/cygwin/path.h @@ -168,7 +168,6 @@ class path_conv bool isro () const {return !!(path_flags & PATH_RO);} bool exists () const {return fileattr != INVALID_FILE_ATTRIBUTES;} bool has_attribute (DWORD x) const {return exists () && (fileattr & x);} - void set_attributes (DWORD x) {fileattr = x;} int isdir () const {return has_attribute (FILE_ATTRIBUTE_DIRECTORY);} executable_states exec_state () { |