Alexandre Julliard : ntdll: Avoid a compiler warning on NetBSD.

Alexandre Julliard julliard at winehq.org
Mon May 17 09:39:27 CDT 2010


Module: wine
Branch: master
Commit: d0093f0055e496769b496226cdaa547de7375611
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d0093f0055e496769b496226cdaa547de7375611

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Sun May 16 17:55:31 2010 +0200

ntdll: Avoid a compiler warning on NetBSD.

---

 dlls/ntdll/cdrom.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/dlls/ntdll/cdrom.c b/dlls/ntdll/cdrom.c
index ab68459..0737e6e 100644
--- a/dlls/ntdll/cdrom.c
+++ b/dlls/ntdll/cdrom.c
@@ -610,20 +610,21 @@ static int CDROM_GetInterfaceInfo(int fd, UCHAR* iface, UCHAR* port, UCHAR* devi
     struct scsi_addr addr;
     if (ioctl(fd, SCIOCIDENTIFY, &addr) != -1)
     {
-        switch (addr.type) 
+        switch (addr.type)
         {
-        case TYPE_SCSI:  *port = 1;
+        case TYPE_SCSI:
+            *port = 1;
             *iface = addr.addr.scsi.scbus;
             *device = addr.addr.scsi.target;
             *lun = addr.addr.scsi.lun;
-            break;
-        case TYPE_ATAPI: *port = 0;
+            return 1;
+        case TYPE_ATAPI:
+            *port = 0;
             *iface = addr.addr.atapi.atbus;
             *device = addr.addr.atapi.drive;
             *lun = 0;
-            break;
+            return 1;
         }
-        return 1;
     }
     return 0;
 #elif defined(__FreeBSD__)




More information about the wine-cvs mailing list