[Scummvm-git-logs] scummvm master -> ebe05ea348f40fd1e3dd724dc18f41ecad4be9a6

[Strangerke]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ebe05ea348 BAGEL: Remove more null checks priori to delete


Commit: ebe05ea348f40fd1e3dd724dc18f41ecad4be9a6
    https://github.com/scummvm/scummvm/commit/ebe05ea348f40fd1e3dd724dc18f41ecad4be9a6
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-24T23:09:01+01:00

Commit Message:
BAGEL: Remove more null checks priori to delete

Changed paths:
    engines/bagel/baglib/character_object.cpp
    engines/bagel/boflib/dat_file.cpp
    engines/bagel/spacebar/nav_window.cpp
    engines/bagel/spacebar/sraf_computer.cpp


diff --git a/engines/bagel/baglib/character_object.cpp b/engines/bagel/baglib/character_object.cpp
index da80070bdb4..53bf57fe149 100644
--- a/engines/bagel/baglib/character_object.cpp
+++ b/engines/bagel/baglib/character_object.cpp
@@ -169,10 +169,8 @@ ErrorCode CBagCharacterObject::detach() {
 		_smacker = nullptr;
 	}
 
-	if (_bmpBuf != nullptr) {
-		delete _bmpBuf;
-		_bmpBuf = nullptr;
-	}
+	delete _bmpBuf;
+	_bmpBuf = nullptr;
 
 	if (_binBuf != nullptr) {
 		bofFree(_binBuf);
diff --git a/engines/bagel/boflib/dat_file.cpp b/engines/bagel/boflib/dat_file.cpp
index 291292d7b90..8af430af501 100644
--- a/engines/bagel/boflib/dat_file.cpp
+++ b/engines/bagel/boflib/dat_file.cpp
@@ -110,10 +110,8 @@ ErrorCode CBofDataFile::releaseFile() {
 	close();
 
 	// Free header buffer
-	if (_pHeader != nullptr) {
-		delete[] _pHeader;
-		_pHeader = nullptr;
-	}
+	delete[] _pHeader;
+	_pHeader = nullptr;
 
 	return _errCode;
 }
@@ -130,10 +128,8 @@ ErrorCode CBofDataFile::create() {
 		}
 
 		// Re-initialize
-		if (_pHeader != nullptr) {
-			delete[] _pHeader;
-			_pHeader = nullptr;
-		}
+		delete[] _pHeader;
+		_pHeader = nullptr;
 
 		_stream = nullptr;
 		_lHeaderLength = 0;
@@ -145,9 +141,7 @@ ErrorCode CBofDataFile::create() {
 		// Create the file
 		if (CBofFile::create(_szFileName, _lFlags) == ERR_NONE) {
 			// Write empty header info
-			if (write(stHeaderInfo) == ERR_NONE) {
-
-			} else {
+			if (write(stHeaderInfo) != ERR_NONE) {
 				_errCode = ERR_FWRITE;
 			}
 
diff --git a/engines/bagel/spacebar/nav_window.cpp b/engines/bagel/spacebar/nav_window.cpp
index aacc1d6e7d7..90bdd53cf3b 100644
--- a/engines/bagel/spacebar/nav_window.cpp
+++ b/engines/bagel/spacebar/nav_window.cpp
@@ -439,10 +439,8 @@ ErrorCode CNavWindow::detach() {
 
 	// Destroy all buttons
 	for (int i = 0; i < 2; i++) {
-		if (_pButtons[i] != nullptr) {
-			delete _pButtons[i];
-			_pButtons[i] = nullptr;
-		}
+		delete _pButtons[i];
+		_pButtons[i] = nullptr;
 	}
 
 	// Close sprite lib
diff --git a/engines/bagel/spacebar/sraf_computer.cpp b/engines/bagel/spacebar/sraf_computer.cpp
index 8610b2dfe27..b952bfb947f 100644
--- a/engines/bagel/spacebar/sraf_computer.cpp
+++ b/engines/bagel/spacebar/sraf_computer.cpp
@@ -842,10 +842,8 @@ SrafComputer::~SrafComputer() {
 	// destruct them in the destructor.
 
 	for (int i = 0; i < (NUM_MUSICAL_SCORES - 1); i++) {
-		if (g_stAudioSetting[i]->_pMidiTrack != nullptr) {
-			delete g_stAudioSetting[i]->_pMidiTrack;
-			g_stAudioSetting[i]->_pMidiTrack = nullptr;
-		}
+		delete g_stAudioSetting[i]->_pMidiTrack;
+		g_stAudioSetting[i]->_pMidiTrack = nullptr;
 	}
 
 	_pTextOnlyScreen = nullptr;