From 36e3789e91c4adaee3fd374334b80f7e38201991 Mon Sep 17 00:00:00 2001 From: krcroft Date: Thu, 6 Feb 2020 10:13:45 -0800 Subject: [PATCH] Remove unecessary check and zeroing of arguments This function uses its boolean return code to indicate success or failure, which all callers check prior to using any of the referenced arguments. Therefore it's unecessary to zero-out referenced arguments or use intermediate variables. --- src/dos/dos_mscdex.cpp | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/src/dos/dos_mscdex.cpp b/src/dos/dos_mscdex.cpp index 83c8ebc5..690c9465 100644 --- a/src/dos/dos_mscdex.cpp +++ b/src/dos/dos_mscdex.cpp @@ -406,18 +406,9 @@ void CMscdex::GetDriverInfo (PhysPt data) { bool CMscdex::GetCDInfo(Bit8u subUnit, Bit8u& tr1, Bit8u& tr2, TMSF& leadOut) { if (subUnit>=numDrives) return false; - uint8_t tr1i; - uint8_t tr2i; // Assume Media change cdrom[subUnit]->InitNewMedia(); - dinfo[subUnit].lastResult = cdrom[subUnit]->GetAudioTracks(tr1i,tr2i,leadOut); - if (!dinfo[subUnit].lastResult) { - tr1 = tr2 = 0; - memset(&leadOut,0,sizeof(leadOut)); - } else { - tr1 = tr1i; - tr2 = tr2i; - } + dinfo[subUnit].lastResult = cdrom[subUnit]->GetAudioTracks(tr1, tr2, leadOut); return dinfo[subUnit].lastResult; }