KERNEL: fix /proc/scsi/scsi parser

Saulius Krasuckas saulius2 at ar.fi.lt
Sat Nov 19 19:08:01 CST 2005


Log message:
	Saulius Krasuckas <saulius.krasuckas at ieee.org>
	- ANSI SCSI revision is a hex number.
	- Be more verbose with parser ERRs.


Index: dlls/kernel/oldconfig.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/oldconfig.c,v
retrieving revision 1.10
diff -p -u -r1.10 oldconfig.c
--- dlls/kernel/oldconfig.c	19 Aug 2005 09:58:40 -0000	1.10
+++ dlls/kernel/oldconfig.c	20 Nov 2005 00:11:18 -0000
@@ -301,7 +301,7 @@ static int SCSI_getprocentry( FILE * pro
     }
     if( result != 4 )
     {
-        ERR("bus id line scan count error\n");
+        ERR("bus id line scan count error (fscanf returns %d, expected 4)\n", result);
         return 0;
     }
     result = fscanf( procfile,
@@ -311,17 +311,17 @@ static int SCSI_getprocentry( FILE * pro
         dev->rev );
     if( result != 3 )
     {
-        ERR("model line scan count error\n");
+        ERR("model line scan count error (fscanf returns %d, expected 3)\n", result);
         return 0;
     }
 
     result = fscanf( procfile,
-        "  Type:%*3[ ]%32c%*1[ ]ANSI%*1[ ]SCSI%*1[ ]revision:%*1[ ]%d\n",
+        "  Type:%*3[ ]%32c%*1[ ]ANSI%*1[ ]SCSI%*1[ ]revision:%*1[ ]%x\n",
         dev->type,
         &dev->ansirev );
     if( result != 2 )
     {
-        ERR("SCSI type line scan count error\n");
+        ERR("SCSI type line scan count error (fscanf returns %d, expected 2)\n", result);
         return 0;
     }
     /* Since we fscanf with %XXc instead of %s.. put a NULL at end */



More information about the wine-patches mailing list