- ANSI SCSI revision is a hex number.

- Be more verbose with parser ERRs.
This commit is contained in:
Saulius Krasuckas 2005-11-21 11:59:03 +00:00 committed by Alexandre Julliard
parent f9a27638f5
commit de9d974f2f
1 changed files with 4 additions and 4 deletions

View File

@ -301,7 +301,7 @@ static int SCSI_getprocentry( FILE * procfile, struct LinuxProcScsiDevice * dev
}
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 * procfile, struct LinuxProcScsiDevice * dev
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 */