Module: wine Branch: master Commit: 664349eacc7ac841e2f75e16b2e7ef189d85696a URL: http://source.winehq.org/git/wine.git/?a=commit;h=664349eacc7ac841e2f75e16b2...
Author: Andrew Talbot andrew.talbot@talbotville.com Date: Tue Apr 22 22:05:03 2008 +0100
ntdll: Remove unused variables.
---
dlls/ntdll/cdrom.c | 8 -------- dlls/ntdll/loadorder.c | 5 ++--- dlls/ntdll/path.c | 3 +-- 3 files changed, 3 insertions(+), 13 deletions(-)
diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c index e53e41d..47bda87 100644 --- a/dlls/ntdll/cdrom.c +++ b/dlls/ntdll/cdrom.c @@ -815,7 +815,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA { NTSTATUS ret = STATUS_NOT_SUPPORTED; #ifdef linux - unsigned size; SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; int io; struct cdrom_subchnl sc; @@ -860,7 +859,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - size = sizeof(SUB_Q_CURRENT_POSITION); RtlEnterCriticalSection( &cache_section ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; @@ -889,7 +887,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA RtlLeaveCriticalSection( &cache_section ); break; case IOCTL_CDROM_MEDIA_CATALOG: - size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; { struct cdrom_mcn mcn; @@ -902,7 +899,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA } break; case IOCTL_CDROM_TRACK_ISRC: - size = sizeof(SUB_Q_CURRENT_POSITION); FIXME("TrackIsrc: NIY on linux\n"); data->TrackIsrc.FormatCode = IOCTL_CDROM_TRACK_ISRC; data->TrackIsrc.Tcval = 0; @@ -913,7 +909,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA end: ret = CDROM_GetStatusCode(io); #elif defined(__FreeBSD__) || defined(__NetBSD__) - unsigned size; SUB_Q_HEADER* hdr = (SUB_Q_HEADER*)data; int io; struct ioc_read_subchannel read_sc; @@ -974,7 +969,6 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA switch (fmt->Format) { case IOCTL_CDROM_CURRENT_POSITION: - size = sizeof(SUB_Q_CURRENT_POSITION); RtlEnterCriticalSection( &cache_section ); if (hdr->AudioStatus==AUDIO_STATUS_IN_PROGRESS) { data->CurrentPosition.FormatCode = IOCTL_CDROM_CURRENT_POSITION; @@ -1000,13 +994,11 @@ static NTSTATUS CDROM_ReadQChannel(int dev, int fd, const CDROM_SUB_Q_DATA_FORMA RtlLeaveCriticalSection( &cache_section ); break; case IOCTL_CDROM_MEDIA_CATALOG: - size = sizeof(SUB_Q_MEDIA_CATALOG_NUMBER); data->MediaCatalog.FormatCode = IOCTL_CDROM_MEDIA_CATALOG; data->MediaCatalog.Mcval = sc.what.media_catalog.mc_valid; memcpy(data->MediaCatalog.MediaCatalog, sc.what.media_catalog.mc_number, 15); break; case IOCTL_CDROM_TRACK_ISRC: - size = sizeof(SUB_Q_CURRENT_POSITION); data->TrackIsrc.FormatCode = IOCTL_CDROM_TRACK_ISRC; data->TrackIsrc.Tcval = sc.what.track_info.ti_valid; memcpy(data->TrackIsrc.TrackIsrc, sc.what.track_info.ti_number, 15); diff --git a/dlls/ntdll/loadorder.c b/dlls/ntdll/loadorder.c index c31b633..ae50a4c 100644 --- a/dlls/ntdll/loadorder.c +++ b/dlls/ntdll/loadorder.c @@ -376,12 +376,11 @@ static enum loadorder get_registry_value( HANDLE hkey, const WCHAR *module ) UNICODE_STRING valueW; char buffer[80]; DWORD count; - BOOL ret;
RtlInitUnicodeString( &valueW, module );
- if ((ret = !NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, - buffer, sizeof(buffer), &count ))) + if (!NtQueryValueKey( hkey, &valueW, KeyValuePartialInformation, + buffer, sizeof(buffer), &count )) { WCHAR *str = (WCHAR *)((KEY_VALUE_PARTIAL_INFORMATION *)buffer)->Data; return parse_load_order( str ); diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index d7be183..a6fb090 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -596,7 +596,6 @@ static const WCHAR *skip_unc_prefix( const WCHAR *ptr ) static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) { ULONG reqsize = 0, mark = 0, dep = 0, deplen; - DOS_PATHNAME_TYPE type; LPWSTR ins_str = NULL; LPCWSTR ptr; const UNICODE_STRING* cd; @@ -613,7 +612,7 @@ static ULONG get_full_path_helper(LPCWSTR name, LPWSTR buffer, ULONG size) else cd = &NtCurrentTeb()->Peb->ProcessParameters->CurrentDirectory.DosPath;
- switch (type = RtlDetermineDosPathNameType_U(name)) + switch (RtlDetermineDosPathNameType_U(name)) { case UNC_PATH: /* \foo */ ptr = skip_unc_prefix( name );