* 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.
This commit is contained in:
		| @@ -1,3 +1,9 @@ | |||||||
|  | 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> | 2005-09-30  Corinna Vinschen  <corinna@vinschen.de> | ||||||
|  |  | ||||||
| 	* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Use | 	* fhandler_floppy.cc (fhandler_dev_floppy::get_drive_info): Use | ||||||
|   | |||||||
| @@ -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 | 	  /* If the change time is 0, it's a file system which doesn't | ||||||
| 	     support a change timestamp.  In that case use the LastWriteTime | 	     support a change timestamp.  In that case use the LastWriteTime | ||||||
| 	     entry, as in other calls to fstat_helper. */ | 	     entry, as in other calls to fstat_helper. */ | ||||||
| 	  pc.set_attributes (pfai->BasicInformation.FileAttributes); | 	  pc.file_attributes (pfai->BasicInformation.FileAttributes); | ||||||
| 	  return fstat_helper (buf, | 	  return fstat_helper (buf, | ||||||
| 			   pfai->BasicInformation.ChangeTime.QuadPart ? | 			   pfai->BasicInformation.ChangeTime.QuadPart ? | ||||||
| 			   *(FILETIME *) &pfai->BasicInformation.ChangeTime : | 			   *(FILETIME *) &pfai->BasicInformation.ChangeTime : | ||||||
| @@ -165,7 +165,7 @@ fhandler_base::fstat_by_handle (struct __stat64 *buf) | |||||||
|       local.dwFileAttributes = DWORD (pc); |       local.dwFileAttributes = DWORD (pc); | ||||||
|     } |     } | ||||||
|   else |   else | ||||||
|     pc.set_attributes (local.dwFileAttributes); |     pc.file_attributes (local.dwFileAttributes); | ||||||
|   return fstat_helper (buf, |   return fstat_helper (buf, | ||||||
| 		       local.ftLastWriteTime, /* see fstat_helper comment */ | 		       local.ftLastWriteTime, /* see fstat_helper comment */ | ||||||
| 		       local.ftLastAccessTime, | 		       local.ftLastAccessTime, | ||||||
| @@ -196,7 +196,7 @@ fhandler_base::fstat_by_name (struct __stat64 *buf) | |||||||
|   else if ((handle = FindFirstFile (pc, &local)) != INVALID_HANDLE_VALUE) |   else if ((handle = FindFirstFile (pc, &local)) != INVALID_HANDLE_VALUE) | ||||||
|     { |     { | ||||||
|       FindClose (handle); |       FindClose (handle); | ||||||
|       pc.set_attributes (local.dwFileAttributes); |       pc.file_attributes (local.dwFileAttributes); | ||||||
|       res = fstat_helper (buf, |       res = fstat_helper (buf, | ||||||
| 			  local.ftLastWriteTime, /* see fstat_helper comment */ | 			  local.ftLastWriteTime, /* see fstat_helper comment */ | ||||||
| 			  local.ftLastAccessTime, | 			  local.ftLastAccessTime, | ||||||
|   | |||||||
| @@ -168,7 +168,6 @@ class path_conv | |||||||
|   bool isro () const {return !!(path_flags & PATH_RO);} |   bool isro () const {return !!(path_flags & PATH_RO);} | ||||||
|   bool exists () const {return fileattr != INVALID_FILE_ATTRIBUTES;} |   bool exists () const {return fileattr != INVALID_FILE_ATTRIBUTES;} | ||||||
|   bool has_attribute (DWORD x) const {return exists () && (fileattr & x);} |   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);} |   int isdir () const {return has_attribute (FILE_ATTRIBUTE_DIRECTORY);} | ||||||
|   executable_states exec_state () |   executable_states exec_state () | ||||||
|   { |   { | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user