removed unused variable

saramibreak · Nov 29, 2023 · 5a908ee · 5a908ee
1 parent 0bf6d6b
commit 5a908ee
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 12 deletions.
diff --git a/DiscImageCreator/DiscImageCreator.cpp b/DiscImageCreator/DiscImageCreator.cpp
@@ -216,7 +216,7 @@ int execForDumping(PEXEC_TYPE pExecType, PEXT_ARG pExtArg, _TCHAR* pszFullPath,
 						throw FALSE;
 					}
 
-					InitMainDataHeader(pExecType, pExtArg, &mainHeader, (INT)s_nStartLBA);
+					InitMainDataHeader(pExecType, &mainHeader, (INT)s_nStartLBA);
 					if (!InitSubData(pExecType, &pDisc)) {
 						throw FALSE;
 					}

diff --git a/DiscImageCreator/execScsiCmdforCD.cpp b/DiscImageCreator/execScsiCmdforCD.cpp
@@ -1089,7 +1089,7 @@ BOOL ReadCDAll(
 			OutputString("\rChecking SubQ ctl (Track) %2u/%2u", p + 1, pDisc->SCSI.toc.LastTrack);
 		}
 		OutputString("\n");
-		SetCDOffset(pExecType, pExtArg->byBe, pDevice->byPlxtrDrive, pDisc, 0, pDisc->SCSI.nAllLength);
+		SetCDOffset(pExecType, pDevice->byPlxtrDrive, pDisc, 0, pDisc->SCSI.nAllLength);
 
 		pDiscPerSector->byTrackNum = pDisc->SCSI.toc.FirstTrack;
 		INT n1stLBAForSub = 0;
@@ -1523,7 +1523,7 @@ BOOL ReadCDForSwap(
 			type = CDFLAG::_READ_CD::All;
 		}
 		SetReadDiscCommand(pExtArg, pDevice, byTransferLen, type, c2, pDevice->sub, lpCmd, TRUE);
-		SetCDOffset(pExecType, pExtArg->byBe, pDevice->byPlxtrDrive, pDisc, nStart, nEnd);
+		SetCDOffset(pExecType, pDevice->byPlxtrDrive, pDisc, nStart, nEnd);
 		pDiscPerSector->byTrackNum = 1;
 
 		INT n1stLBA = nStart + pDisc->MAIN.nOffsetStart;
@@ -2016,7 +2016,7 @@ BOOL ReadCDPartial(
 			}
 			OutputString("\n");
 		}
-		SetCDOffset(pExecType, pExtArg->byBe, pDevice->byPlxtrDrive, pDisc, nStart, nEnd);
+		SetCDOffset(pExecType, pDevice->byPlxtrDrive, pDisc, nStart, nEnd);
 #ifdef _DEBUG
 		OutputString(
 			"byBe: %d, nCombinedOffset: %d, uiMainDataSlideSize: %u, nOffsetStart: %d, nOffsetEnd: %d, nFixStartLBA: %d, nFixEndLBA: %d\n"
@@ -2522,7 +2522,7 @@ BOOL ReadCDOutOfRange(
 	if (pDisc->MAIN.nCombinedOffset < 0) {
 		nOverreadSize = pDisc->MAIN.nAdjustSectorNum;
 	}
-	SetCDOffset(pExecType, pExtArg->byBe, pDevice->byPlxtrDrive, pDisc, 0, pDisc->SCSI.nAllLength);
+	SetCDOffset(pExecType, pDevice->byPlxtrDrive, pDisc, 0, pDisc->SCSI.nAllLength);
 
 	if (pDisc->SCSI.by1stMultiSessionTrkNum) {
 		SetReadDiscCommand(pExtArg, pDevice, 2

diff --git a/DiscImageCreator/init.cpp b/DiscImageCreator/init.cpp
@@ -163,15 +163,13 @@ BOOL InitTocTextData(
 
 VOID InitMainDataHeader(
 	PEXEC_TYPE pExecType,
-	PEXT_ARG pExtArg,
 	PMAIN_HEADER pMain,
 	INT nLBA
 ) {
 	memcpy(pMain->current, g_aSyncHeader, sizeof(g_aSyncHeader));
 	BYTE m, s, f;
 	LBAtoMSF(nLBA + 150, &m, &s, &f);
 	if (*pExecType != data) {
-//	if (!pExtArg->byBe && *pExecType != data) {
 		pMain->current[12] = (BYTE)(DecToBcd(m) ^ 0x01);
 		pMain->current[13] = (BYTE)(DecToBcd(s) ^ 0x80);
 	}

diff --git a/DiscImageCreator/init.h b/DiscImageCreator/init.h
@@ -38,7 +38,6 @@ BOOL InitTocTextData(
 
 VOID InitMainDataHeader(
 	PEXEC_TYPE pExecType,
-	PEXT_ARG pExtArg,
 	PMAIN_HEADER pMain,
 	INT nLBA
 );

diff --git a/DiscImageCreator/set.cpp b/DiscImageCreator/set.cpp
@@ -1101,15 +1101,13 @@ VOID SetAndOutputCDOffset(
 
 VOID SetCDOffset(
 	PEXEC_TYPE pExecType,
-	BYTE byBe,
 	BYTE byPlxtrDrive,
 	PDISC pDisc,
 	INT nStartLBA,
 	INT nEndLBA
 ) {
 	if (pDisc->MAIN.nCombinedOffset > 0) {
 		if (*pExecType == data) {
-//		if (*pExecType != gd && byBe && pDisc->SCSI.trkType != TRACK_TYPE::audioOnly) {
 			pDisc->MAIN.uiMainDataSlideSize = 0;
 			pDisc->MAIN.nOffsetStart = 0;
 			pDisc->MAIN.nOffsetEnd = 0;
@@ -1133,7 +1131,6 @@ VOID SetCDOffset(
 	}
 	else if (pDisc->MAIN.nCombinedOffset < 0) {
 		if (*pExecType == data) {
-//		if (*pExecType != gd && byBe && pDisc->SCSI.trkType != TRACK_TYPE::audioOnly) {
 			pDisc->MAIN.uiMainDataSlideSize = 0;
 			pDisc->MAIN.nOffsetStart = 0;
 			pDisc->MAIN.nOffsetEnd = 0;

diff --git a/DiscImageCreator/set.h b/DiscImageCreator/set.h
@@ -102,7 +102,6 @@ VOID SetAndOutputCDOffset(
 
 VOID SetCDOffset(
 	PEXEC_TYPE pExecType,
-	BYTE byBe,
 	BYTE byPlxtrDrive,
 	PDISC pDisc,
 	INT nStartLBA,