Fixed unused variable and parameter warnings.

[vlc] / modules / gui / eject.c

diff --git a/modules/gui/eject.c b/modules/gui/eject.c
index 80ba7f1ced30618b57164adee93c9bcad2232e65..e4109aade0177df94a380cffcdfe77a7488af61a 100644 (file)
--- a/modules/gui/eject.c
+++ b/modules/gui/eject.c
@@ -34,8 +34,9 @@
 
 #include <vlc_common.h>
 #include <vlc_fs.h>
+#include <vlc_charset.h>
 
-#if defined( WIN32 )
+#if defined( _WIN32 )
 #   include <mmsystem.h>
 #elif defined(__linux__)
 #   include <sys/types.h>
@@ -122,15 +123,15 @@ static int intf_Eject( vlc_object_t *p_this, const char *psz_device )
 {
     VLC_UNUSED(p_this);
 
-#if defined(WIN32)
+#if defined(_WIN32)
     MCI_OPEN_PARMS op;
     DWORD i_flags;
-    char psz_drive[4];
+    TCHAR psz_drive[4];
 
     memset( &op, 0, sizeof(MCI_OPEN_PARMS) );
-    op.lpstrDeviceType = (LPCSTR)MCI_DEVTYPE_CD_AUDIO;
+    op.lpstrDeviceType = (LPCTSTR)MCI_DEVTYPE_CD_AUDIO;
 
-    strcpy( psz_drive, "X:" );
+    _tcscpy( psz_drive, TEXT("X:") );
     psz_drive[0] = psz_device[0];
     op.lpstrElementName = psz_drive;
 
@@ -169,9 +170,11 @@ static int intf_Eject( vlc_object_t *p_this, const char *psz_device )
         close( fd );
         return VLC_EGENERIC;
     }
+    close( fd );
     return VLC_SUCCESS;
 
 #else
+    VLC_UNUSED( psz_device );
     msg_Warn( p_this, "CD-Rom ejection unsupported on this platform" );
     return VLC_EGENERIC;
 #endif