wine/dlls/kernel oldconfig.c

[Alexandre Julliard]

ChangeSet ID:	21355
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/11/21 05:59:03

Modified files:
    dlls/kernel    : oldconfig.c

Log message:
    Saulius Krasuckas 
    - ANSI SCSI revision is a hex number.
    - Be more verbose with parser ERRs.

Patch: http://cvs.winehq.org/patch.py?id=21355

Old revision  New revision  Changes     Path
 1.10          1.11          +4 -4       wine/dlls/kernel/oldconfig.c

Index: wine/dlls/kernel/oldconfig.c
diff -u -p wine/dlls/kernel/oldconfig.c:1.10 wine/dlls/kernel/oldconfig.c:1.11
--- wine/dlls/kernel/oldconfig.c:1.10	21 Nov 2005 11:59: 3 -0000
+++ wine/dlls/kernel/oldconfig.c	21 Nov 2005 11:59: 3 -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 */