Alexandre Julliard : ntdll: FILE_GetDeviceInfo no longer needs to be
public .
Alexandre Julliard
julliard at wine.codeweavers.com
Sat Nov 4 13:32:32 CST 2006
Module: wine
Branch: master
Commit: 511e0bb671a02ddc8305ffe01587e2dd89a13532
URL: http://source.winehq.org/git/wine.git/?a=commit;h=511e0bb671a02ddc8305ffe01587e2dd89a13532
Author: Alexandre Julliard <julliard at winehq.org>
Date: Fri Nov 3 15:20:21 2006 +0100
ntdll: FILE_GetDeviceInfo no longer needs to be public.
---
dlls/ntdll/file.c | 10 +++++-----
dlls/ntdll/ntdll_misc.h | 1 -
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index d91666a..7b170a8 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1617,8 +1617,8 @@ NTSTATUS WINAPI NtQueryAttributesFile( c
#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__NetBSD__) || defined(__APPLE__)
/* helper for FILE_GetDeviceInfo to hide some platform differences in fstatfs */
-static inline get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename,
- size_t fstypesize, unsigned int flags )
+static inline void get_device_info_fstatfs( FILE_FS_DEVICE_INFORMATION *info, const char *fstypename,
+ size_t fstypesize, unsigned int flags )
{
if (!strncmp("cd9660", fstypename, fstypesize) ||
!strncmp("udf", fstypename, fstypesize))
@@ -1652,11 +1652,11 @@ static inline get_device_info_fstatfs( F
#endif
/******************************************************************************
- * FILE_GetDeviceInfo
+ * get_device_info
*
* Implementation of the FileFsDeviceInformation query for NtQueryVolumeInformationFile.
*/
-NTSTATUS FILE_GetDeviceInfo( int fd, FILE_FS_DEVICE_INFORMATION *info )
+static NTSTATUS get_device_info( int fd, FILE_FS_DEVICE_INFORMATION *info )
{
struct stat st;
@@ -1873,7 +1873,7 @@ #endif
{
FILE_FS_DEVICE_INFORMATION *info = buffer;
- if ((io->u.Status = FILE_GetDeviceInfo( fd, info )) == STATUS_SUCCESS)
+ if ((io->u.Status = get_device_info( fd, info )) == STATUS_SUCCESS)
io->Information = sizeof(*info);
}
break;
diff --git a/dlls/ntdll/ntdll_misc.h b/dlls/ntdll/ntdll_misc.h
index d18728f..1225036 100644
--- a/dlls/ntdll/ntdll_misc.h
+++ b/dlls/ntdll/ntdll_misc.h
@@ -105,7 +105,6 @@ extern NTSTATUS TAPE_DeviceIoControl(HAN
/* file I/O */
extern NTSTATUS FILE_GetNtStatus(void);
-extern NTSTATUS FILE_GetDeviceInfo( int fd, FILE_FS_DEVICE_INFORMATION *info );
extern BOOL DIR_is_hidden_file( const UNICODE_STRING *name );
extern NTSTATUS DIR_unmount_device( HANDLE handle );
extern NTSTATUS DIR_get_unix_cwd( char **cwd );
More information about the wine-cvs
mailing list