From: Semenov Herman (Семенов Герман)GermanAizek@yandex.ru
--- dlls/ntdll/unix/file.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-)
diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 790f0f5515f..d25200b6a66 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1624,12 +1624,11 @@ static inline ULONG get_file_attributes( const struct stat *st ) static int parse_samba_dos_attrib_data( char *data, int len ) { char *end; - int val;
if (len > 2 && data[0] == '0' && data[1] == 'x') { data[len] = 0; - val = strtol( data, &end, 16 ); + const int val = strtol( data, &end, 16 ); if (!*end) return val & XATTR_ATTRIBS_MASK; } else @@ -2176,15 +2175,14 @@ static unsigned int get_drives_info( struct file_identity info[MAX_DOS_DRIVES] ) mutex_lock( &cache_mutex ); if (now != last_update) { - char *buffer, *p; + char *buffer; struct stat st; - unsigned int i;
if (asprintf( &buffer, "%s/dosdevices/a:", config_dir ) != -1) { - p = buffer + strlen(buffer) - 2; + char *p = buffer + strlen(buffer) - 2;
- for (i = nb_drives = 0; i < MAX_DOS_DRIVES; i++) + for (unsigned int i = nb_drives = 0; i < MAX_DOS_DRIVES; i++) { *p = 'a' + i; if (!stat( buffer, &st )) @@ -2637,11 +2635,12 @@ static unsigned int get_cached_dir_data( HANDLE handle, struct dir_data **data_r const UNICODE_STRING *mask ) { unsigned int i; - int entry = -1, free_entries[16]; + int entry = -1; unsigned int status;
SERVER_START_REQ( get_directory_cache_entry ) { + int free_entries[16]; req->handle = wine_server_obj_handle( handle ); wine_server_set_reply( req, free_entries, sizeof(free_entries) ); if (!(status = wine_server_call( req ))) entry = reply->entry; @@ -3661,7 +3660,7 @@ static NTSTATUS nt_to_unix_file_name_no_root( const UNICODE_STRING *nameW, char NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, UINT disposition ) { enum server_fd_type type; - int old_cwd, root_fd, needs_close; + int root_fd, needs_close; const WCHAR *name; char *unix_name; int name_len, unix_len; @@ -3689,6 +3688,7 @@ NTSTATUS nt_to_unix_file_name( const OBJECT_ATTRIBUTES *attr, char **name_ret, U else { mutex_lock( &dir_mutex ); + int old_cwd; if ((old_cwd = open( ".", O_RDONLY )) != -1 && fchdir( root_fd ) != -1) { status = lookup_unix_name( name, name_len, &unix_name, unix_len, 1, disposition, FALSE ); @@ -6267,7 +6267,6 @@ NTSTATUS WINAPI NtFsControlFile( HANDLE handle, HANDLE event, PIO_APC_ROUTINE ap NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) { NTSTATUS ret; - HANDLE wait_handle; enum server_fd_type type; int fd, needs_close;
@@ -6289,6 +6288,7 @@ NTSTATUS WINAPI NtFlushBuffersFile( HANDLE handle, IO_STATUS_BLOCK *io ) } else if (ret != STATUS_ACCESS_DENIED) { + HANDLE wait_handle; struct async_irp *async;
if (!(async = (struct async_irp *)alloc_fileio( sizeof(*async), irp_completion, handle ))) @@ -7243,11 +7243,10 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas case ObjectTypesInformation: { OBJECT_TYPES_INFORMATION *types = ptr; - OBJECT_TYPE_INFORMATION *p; struct object_type_info *buffer; /* assume at most 32 types, with an average 16-char name */ UINT size = 32 * (sizeof(struct object_type_info) + 16 * sizeof(WCHAR)); - UINT i, count, pos, total, align = sizeof(DWORD_PTR) - 1; + UINT count, align = sizeof(DWORD_PTR) - 1;
buffer = malloc( size ); SERVER_START_REQ( get_object_types ) @@ -7260,9 +7259,9 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas if (!status) { if (len >= sizeof(*types)) types->NumberOfTypes = count; - total = (sizeof(*types) + align) & ~align; - p = (OBJECT_TYPE_INFORMATION *)((char *)ptr + total); - for (i = pos = 0; i < count; i++) + UINT total = (sizeof(*types) + align) & ~align; + OBJECT_TYPE_INFORMATION *p = (OBJECT_TYPE_INFORMATION *)((char *)ptr + total); + for (UINT i = 0, pos = 0; i < count; i++) { struct object_type_info *info = (struct object_type_info *)((char *)buffer + pos); pos += sizeof(*info) + ((info->name_len + 3) & ~3);