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

[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:
c78088908f BAGEL: remove useless null check before delete, useless comparison to 0 before a loop, move increment and decrement of v


Commit: c78088908f192fac03f44df43d12931691042caa
    https://github.com/scummvm/scummvm/commit/c78088908f192fac03f44df43d12931691042caa
Author: Strangerke (arnaud.boutonne at gmail.com)
Date: 2024-05-08T13:33:41+01:00

Commit Message:
BAGEL: remove useless null check before delete, useless comparison to 0 before a loop, move increment and decrement of variable out of asserts to avoid change of behavior in release version (CID 1544819, 1544893)

Changed paths:
    engines/bagel/baglib/storage_dev_win.cpp


diff --git a/engines/bagel/baglib/storage_dev_win.cpp b/engines/bagel/baglib/storage_dev_win.cpp
index 65bfff316e0..04704163b7d 100644
--- a/engines/bagel/baglib/storage_dev_win.cpp
+++ b/engines/bagel/baglib/storage_dev_win.cpp
@@ -145,7 +145,8 @@ CBagStorageDev::~CBagStorageDev() {
 	if (!_bForiegnList) {
 
 		if (_pObjectList != nullptr) {
-			releaseObjects();                            // Delete all master sprite objects
+			// Delete all master sprite objects
+			CBagStorageDev::releaseObjects();
 			delete _pObjectList;
 			_pObjectList = nullptr;
 		}
@@ -1327,10 +1328,8 @@ ErrorCode CBagStorageDevWnd::setWorkBmp() {
 
 
 ErrorCode CBagStorageDevWnd::killWorkBmp() {
-	if (_pWorkBmp != nullptr) {
-		delete _pWorkBmp;
-		_pWorkBmp = nullptr;
-	}
+	delete _pWorkBmp;
+	_pWorkBmp = nullptr;
 
 	return _errCode;
 }
@@ -1746,22 +1745,18 @@ ErrorCode CBagStorageDevDlg::create(const char *pszName, CBofRect *pRect, CBofWi
 
 
 void CBagStorageDevDlg::onClose() {
-	if (_pDlgBackground != nullptr) {
-		delete _pDlgBackground;
-		_pDlgBackground = nullptr;
-	}
+	delete _pDlgBackground;
+	_pDlgBackground = nullptr;
 
 	// Since our sdevdlg doesn't have a detach active objects
 	// method, we will have to manually take all the existing objects and
 	// tell them to redraw themselves should they ever be called on in life
 	// to do as such.
 	int nCount = getObjectCount();
-	if (nCount != 0) {
-		for (int i = 0; i < nCount; ++i) {
-			CBagObject *pObj = getObjectByPos(i);
-			if (pObj != nullptr) {
-				pObj->setDirty(true);
-			}
+	for (int i = 0; i < nCount; ++i) {
+		CBagObject *pObj = getObjectByPos(i);
+		if (pObj != nullptr) {
+			pObj->setDirty(true);
 		}
 	}
 
@@ -1801,13 +1796,14 @@ void CBagStorageDevDlg::onLButtonUp(uint32 nFlags, CBofPoint *xPoint, void *) {
 }
 
 CBagStorageDevManager::CBagStorageDevManager() {
-	assert(++nSDevMngrs < 2);
+	++nSDevMngrs;
+	assert(nSDevMngrs < 2);
 }
 
 CBagStorageDevManager::~CBagStorageDevManager() {
 	assert(isValidObject(this));
-
-	assert(--nSDevMngrs >= 0);
+	--nSDevMngrs;
+	assert(nSDevMngrs >= 0);
 	releaseStorageDevices();
 	_xStorageDeviceList.removeAll();
 }
@@ -1898,6 +1894,7 @@ bool CBagStorageDevManager::moveObject(const CBofString &sDstName, const CBofStr
 	// Find the storage device
 	if (pDstSDev->activateLocalObject(sObjName) != ERR_NONE)
 		return false;
+	
 	if (pSrcSDev->deactivateLocalObject(sObjName) != ERR_NONE) {
 		pDstSDev->deactivateLocalObject(sObjName);
 		return false;