PATCH: dlls/winaspi -- minor cleanup

Gerald Pfeifer gerald at pfeifer.com
Sat Nov 8 03:01:15 CST 2003


It's amazing what better optimizing compilers spot (in terms of
unused functions and variables). ;-)

Gerald

ChangeLog:
Move scsi_command_size from winescsi.h to SCSI_Fix_CMD_LEN(), its only user.
Index: aspi.c
===================================================================
RCS file: /home/wine/wine/dlls/winaspi/aspi.c,v
retrieving revision 1.19
diff -u -3 -p -r1.19 aspi.c
--- aspi.c	22 Aug 2003 05:05:56 -0000	1.19
+++ aspi.c	8 Nov 2003 08:59:20 -0000
@@ -306,6 +306,13 @@ linux_hack:
 void
 SCSI_Fix_CMD_LEN(int fd, int cmd, int len)
 {
+	/* This is what the linux kernel thinks.... */
+	static const unsigned char scsi_command_size[8] =
+	{
+        	6, 10, 10, 12,
+        	12, 12, 10, 10
+	};
+
 	int index=(cmd>>5)&7;

 	if (len!=scsi_command_size[index])
Index: winescsi.h
===================================================================
RCS file: /home/wine/wine/dlls/winaspi/winescsi.h,v
retrieving revision 1.7
diff -u -3 -p -r1.7 winescsi.h
--- winescsi.h	31 May 2002 23:40:54 -0000	1.7
+++ winescsi.h	8 Nov 2003 08:59:20 -0000
@@ -26,13 +26,6 @@
 #define SG_NEXT_CMD_LEN 0x2283  /* override SCSI command length with given
 		   number on the next write() on this file descriptor */

-/* This is what the linux kernel thinks.... */
-static const unsigned char scsi_command_size[8] =
-{
-	6, 10, 10, 12,
-	12, 12, 10, 10
-};
-
 struct sg_header
 {
     int pack_len;    /* [o] reply_len (ie useless), ignored as input */



More information about the wine-patches mailing list