valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Refactor slightly to clarify the flow and move to one return-point

Browse source 
This also squashes a PVS high issue mentioning that 'subUnit'
is checked after it was used.
This commit is contained in:
krcroft 2020-02-06 00:27:09 -08:00
parent 0272145955
commit e1fec4beb7
No known key found for this signature in database
GPG key ID: 4AD3678F4A2C291C
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/dos/dos_mscdex.cpp
View file

@ -1300,26 +1300,27 @@ bool MSCDEX_GetVolumeName(Bit8u subUnit, char* name)
bool MSCDEX_HasMediaChanged(Bit8u subUnit)
{
bool has_changed = true;
static TMSF leadOut[MSCDEX_MAX_DRIVES];
TMSF leadnew;
Bit8u tr1,tr2; // <== place-holders (use lead-out for change status)
if (mscdex->GetCDInfo(subUnit,tr1,tr2,leadnew)) {
bool changed = (leadOut[subUnit].min!=leadnew.min) || (leadOut[subUnit].sec!=leadnew.sec) || (leadOut[subUnit].fr!=leadnew.fr);
if (changed) {
has_changed = (leadOut[subUnit].min != leadnew.min
|| leadOut[subUnit].sec != leadnew.sec
|| leadOut[subUnit].fr != leadnew.fr);
if (has_changed) {
leadOut[subUnit].min = leadnew.min;
leadOut[subUnit].sec = leadnew.sec;
leadOut[subUnit].fr = leadnew.fr;
mscdex->InitNewMedia(subUnit);
}
return changed;
};
if (subUnit<MSCDEX_MAX_DRIVES) {
// fail-safe assumes the media has changed (if a valid drive is selected)
} else if (subUnit<MSCDEX_MAX_DRIVES) {
leadOut[subUnit].min = 0;
leadOut[subUnit].sec = 0;
leadOut[subUnit].fr = 0;
}
return true;
return has_changed;
}
void MSCDEX_ShutDown(Section* /*sec*/) {