[Scummvm-git-logs] scummvm master -> 1f5185f130aea029b00d04761d3cc999634ca101
digitall
547637+digitall at users.noreply.github.com
Sun Nov 10 18:28:24 CET 2019
This automated email contains information about 8 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
e30112b814 AMIGAOS4: Clean up fs
072e80580b AMIGAOS4: Fix leftovers
db367845d3 AmigaOS4: More fixes and cleaning
994967cfed AMIGAOS4: Clean up and increase stack cookie
2afb56cdf4 AMIGAOS4: Increase stack cookie
86ba632fe0 AMIGAOS4: more verbose debug comments
04b111db70 AMIGAOS4: Fix oversight
1f5185f130 AMIGAOS4: Formatting
Commit: e30112b8148a660a2784a8cbcb5679dccdaecce8
https://github.com/scummvm/scummvm/commit/e30112b8148a660a2784a8cbcb5679dccdaecce8
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AMIGAOS4: Clean up fs
- replace sprintf with snprintf and obey MAXPATHLEN
Changed paths:
backends/fs/amigaos4/amigaos4-fs.cpp
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index 7657bf2..806bd1e 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -40,7 +40,7 @@ const char *lastPathComponent(const Common::String &str) {
int offset = str.size();
if (offset <= 0) {
- debug(6, "Bad offset");
+ debug(6, "Bad offset!");
return 0;
}
@@ -71,31 +71,30 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
int offset = p.size();
- //assert(offset > 0);
-
if (offset <= 0) {
- debug(6, "Bad offset");
+ debug(6, "Bad offset!");
return;
}
- // WORKAROUND:
- // This is a bug in AmigaOS4 newlib.library 53.30 and lower.
- // It will be removed once a fixed version is available to public.
- // DESCRIPTION:
- // We need to explicitly open dos.library and its IDOS interface.
- // Otherwise we will hit an IDOS NULL pointer after compiling a
- // shared binary with (shared) plugins.
- // The hit will happen on loading a game from any engine, if more
- // than one engine/(shared) plugin is available.
- DOSBase = IExec->OpenLibrary("dos.library", 0);
- IDOS = (struct DOSIFace *)IExec->GetInterface(DOSBase, "main", 1, NULL);
-
_sPath = p;
_sDisplayName = ::lastPathComponent(_sPath);
_pFileLock = 0;
_bIsDirectory = false;
_bIsValid = false;
+ // WORKAROUND:
+ // This is a workaround for a bug present in AmigaOS4's
+ // newlib.library 53.30 and lower.
+ // It will be removed once a fixed version of said library is
+ // available to the public.
+ // DESCRIPTION:
+ // We need to explicitly open dos.library and it's IDOS interface.
+ // Otherwise it will hit a NULL pointer with a shared binary build.
+ // The hit will happen on loading a game from any engine, if
+ // more than one engine (shared) plugin is available.
+ DOSBase = IExec->OpenLibrary("dos.library", 0);
+ IDOS = (struct DOSIFace *)IExec->GetInterface(DOSBase, "main", 1, NULL);
+
// Check whether the node exists and if it's a directory.
struct ExamineData * pExd = IDOS->ExamineObjectTags(EX_StringNameInput,_sPath.c_str(),TAG_END);
if (pExd) {
@@ -105,7 +104,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
_pFileLock = IDOS->Lock((CONST_STRPTR)_sPath.c_str(), SHARED_LOCK);
_bIsValid = (_pFileLock != 0);
- // Add a trailing slash if needed.
+ // Add a trailing slash, if needed.
const char c = _sPath.lastChar();
if (c != '/' && c != ':')
_sPath += '/';
@@ -127,6 +126,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayName) {
ENTER();
+
int bufSize = MAXPATHLEN;
_pFileLock = 0;
@@ -151,17 +151,20 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
delete[] n;
}
- _bIsValid = false;
_bIsDirectory = false;
+ _bIsValid = false;
+ // Check whether the node exists and if it's a directory.
struct ExamineData * pExd = IDOS->ExamineObjectTags(EX_FileLockInput,pLock,TAG_END);
if (pExd) {
_nProt = pExd->Protection;
if (EXD_IS_DIRECTORY(pExd)) {
_bIsDirectory = true;
+
_pFileLock = IDOS->DupLock(pLock);
_bIsValid = _pFileLock != 0;
+ // Add a trailing slash, if needed.
const char c = _sPath.lastChar();
if (c != '/' && c != ':')
_sPath += '/';
@@ -172,7 +175,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
IDOS->FreeDosObject(DOS_EXAMINEDATA, pExd);
} else {
- debug(6, "ExamineObject() returned NULL");
+ debug(6, "ExamineObject() returned NULL!");
}
LEAVE();
@@ -222,12 +225,31 @@ bool AmigaOSFilesystemNode::exists() const {
// IDOS->FreeDosObject(DOS_FIB, fib);
//
// ============================= New code
+
+ // WORKAROUND:
+ // This is a workaround for a bug present in AmigaOS4's
+ // newlib.library 53.30 and lower.
+ // It will be removed once a fixed version of said library is
+ // available to the public.
+ // DESCRIPTION:
+ // We need to explicitly open dos.library and it's IDOS interface.
+ // Otherwise it will hit a NULL pointer with a shared binary build.
+ // The hit will happen on loading a game from any engine, if
+ // more than one engine (shared) plugin is available.
+ DOSBase = IExec->OpenLibrary("dos.library", 0);
+ IDOS = (struct DOSIFace *)IExec->GetInterface(DOSBase, "main", 1, NULL);
+
BPTR pLock = IDOS->Lock(_sPath.c_str(), SHARED_LOCK);
if (pLock) {
nodeExists = true;
IDOS->UnLock(pLock);
}
+ // WORKAROUND 2:
+ // Close dos.library and its IDOS interface again.
+ IExec->DropInterface((struct Interface *)IDOS);
+ IExec->CloseLibrary(DOSBase);
+
LEAVE();
return nodeExists;
}
@@ -235,7 +257,7 @@ bool AmigaOSFilesystemNode::exists() const {
AbstractFSNode *AmigaOSFilesystemNode::getChild(const Common::String &n) const {
ENTER();
if (!_bIsDirectory) {
- debug(6, "Not a directory");
+ debug(6, "Not a directory!");
return 0;
}
@@ -255,30 +277,31 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
bool ret = false;
if (!_bIsValid) {
- debug(6, "Invalid node");
+ debug(6, "Invalid node!");
LEAVE();
return false; // Empty list
}
if (!_bIsDirectory) {
- debug(6, "Not a directory");
+ debug(6, "Not a directory!");
LEAVE();
return false; // Empty list
}
if (isRootNode()) {
- debug(6, "Root node");
+ debug(6, "Root node!");
LEAVE();
myList = listVolumes();
return true;
}
APTR context = IDOS->ObtainDirContextTags( EX_FileLockInput, _pFileLock,
- EX_DoCurrentDir, TRUE, /* for softlinks */
- EX_DataFields, (EXF_NAME|EXF_LINK|EXF_TYPE),
- TAG_END);
+ EX_DoCurrentDir, TRUE, /* for softlinks */
+ EX_DataFields, (EXF_NAME|EXF_LINK|EXF_TYPE),
+ TAG_END);
if (context) {
- struct ExamineData * pExd = NULL; // NB: No need to free the value after usage, everything will be dealt with by the DirContext release
+ struct ExamineData * pExd = NULL; // No need to free the value after usage, everything
+ // will be dealt with by the DirContext release.
AmigaOSFilesystemNode *entry;
while ( (pExd = IDOS->ExamineDir(context)) ) {
@@ -300,7 +323,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
}
if (ERROR_NO_MORE_ENTRIES != IDOS->IoErr() ) {
- debug(6, "An error occurred during ExamineDir");
+ debug(6, "IoErr() - ExamineDir (NO_MORE_ENTRIES)!");
ret = false;
} else {
ret = true;
@@ -309,7 +332,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
IDOS->ReleaseDirContext(context);
} else {
- debug(6, "Unable to ObtainDirContext");
+ debug(6, "Unable to ObtainDirContext!");
ret = false;
}
@@ -322,7 +345,7 @@ AbstractFSNode *AmigaOSFilesystemNode::getParent() const {
ENTER();
if (isRootNode()) {
- debug(6, "Root node");
+ debug(6, "Root node!");
LEAVE();
return new AmigaOSFilesystemNode(*this);
}
@@ -388,7 +411,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
struct DosList *dosList = IDOS->LockDosList(kLockFlags);
if (!dosList) {
- debug(6, "Cannot lock the DOS list");
+ debug(6, "Cannot lock DOS list!");
LEAVE();
return myList;
}
@@ -408,7 +431,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
// which errored using SDK 53.24 with a
// 'struct dosList' has no member called 'dol_Task'
// The reason for that was, that
- // 1) dol_Task wasn't a task pointer, it is a message port instead.
+ // 1) dol_Task wasn't a task pointer, it was a message port instead.
// 2) it was redefined to be dol_Port in dos/obsolete.h in aforementioned SDK.
// Copy name to buffer.
@@ -429,7 +452,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
// Find device name.
IDOS->DevNameFromLock(volumeLock, devName, MAXPATHLEN, DN_DEVICEONLY);
- sprintf(buffer, "%s (%s)", volName, devName);
+ snprintf(buffer, MAXPATHLEN, "%s (%s)", volName, devName);
delete[] devName;
@@ -467,3 +490,4 @@ bool AmigaOSFilesystemNode::createDirectory() {
}
#endif //defined(__amigaos4__)
+
Commit: 072e80580be4a38e5c58a48a397335095ee5a846
https://github.com/scummvm/scummvm/commit/072e80580be4a38e5c58a48a397335095ee5a846
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AMIGAOS4: Fix leftovers
Changed paths:
backends/fs/amigaos4/amigaos4-fs.cpp
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index 806bd1e..a6812a2 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -126,7 +126,6 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(const Common::String &p) {
AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayName) {
ENTER();
-
int bufSize = MAXPATHLEN;
_pFileLock = 0;
@@ -160,7 +159,6 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
_nProt = pExd->Protection;
if (EXD_IS_DIRECTORY(pExd)) {
_bIsDirectory = true;
-
_pFileLock = IDOS->DupLock(pLock);
_bIsValid = _pFileLock != 0;
@@ -226,30 +224,12 @@ bool AmigaOSFilesystemNode::exists() const {
//
// ============================= New code
- // WORKAROUND:
- // This is a workaround for a bug present in AmigaOS4's
- // newlib.library 53.30 and lower.
- // It will be removed once a fixed version of said library is
- // available to the public.
- // DESCRIPTION:
- // We need to explicitly open dos.library and it's IDOS interface.
- // Otherwise it will hit a NULL pointer with a shared binary build.
- // The hit will happen on loading a game from any engine, if
- // more than one engine (shared) plugin is available.
- DOSBase = IExec->OpenLibrary("dos.library", 0);
- IDOS = (struct DOSIFace *)IExec->GetInterface(DOSBase, "main", 1, NULL);
-
BPTR pLock = IDOS->Lock(_sPath.c_str(), SHARED_LOCK);
if (pLock) {
nodeExists = true;
IDOS->UnLock(pLock);
}
- // WORKAROUND 2:
- // Close dos.library and its IDOS interface again.
- IExec->DropInterface((struct Interface *)IDOS);
- IExec->CloseLibrary(DOSBase);
-
LEAVE();
return nodeExists;
}
@@ -490,4 +470,3 @@ bool AmigaOSFilesystemNode::createDirectory() {
}
#endif //defined(__amigaos4__)
-
Commit: db367845d3c24d51df2bf07cc4686bc92d05fc8d
https://github.com/scummvm/scummvm/commit/db367845d3c24d51df2bf07cc4686bc92d05fc8d
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AmigaOS4: More fixes and cleaning
Changed paths:
backends/fs/amigaos4/amigaos4-fs.cpp
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index a6812a2..5f77590 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -223,7 +223,6 @@ bool AmigaOSFilesystemNode::exists() const {
// IDOS->FreeDosObject(DOS_FIB, fib);
//
// ============================= New code
-
BPTR pLock = IDOS->Lock(_sPath.c_str(), SHARED_LOCK);
if (pLock) {
nodeExists = true;
@@ -391,7 +390,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
struct DosList *dosList = IDOS->LockDosList(kLockFlags);
if (!dosList) {
- debug(6, "Cannot lock DOS list!");
+ debug(6, "Cannot LockDOSList!");
LEAVE();
return myList;
}
Commit: 994967cfed63f377cff2f2f897b6d6e10699e667
https://github.com/scummvm/scummvm/commit/994967cfed63f377cff2f2f897b6d6e10699e667
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AMIGAOS4: Clean up and increase stack cookie
Changed paths:
backends/platform/sdl/amigaos/amigaos-main.cpp
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index ba11717..d0990a6 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -31,15 +31,15 @@
int main(int argc, char *argv[]) {
- // The following will gather the application name and add the install path
- // to a variable in AmigaOS4's ENV(ARC) system. It will be placed in AppPaths
- // so that ScummVM can become AmiUpdate aware
+ // The following will gather the application name and add the binary path
+ // to a variable in AmigaOS4's ENV(ARC) system. It will then be placed in
+ // AppPaths, so that ScummVM becomes AmiUpdate aware.
const char *const appname = "ScummVM";
BPTR lock;
APTR oldwin;
- // Obtain a lock to the home directory
+ // Obtain a lock to the home directory.
if ((lock = IDOS->GetProgramDir())) {
TEXT progpath[2048];
TEXT apppath[1024] = "AppPaths";
@@ -49,36 +49,36 @@ int main(int argc, char *argv[]) {
sizeof(progpath),
DN_FULLPATH)) {
- // Stop any "Insert volume..." type requesters
+ // Stop any "Insert volume..." type requesters.
oldwin = IDOS->SetProcWindow((APTR)-1);
- // Finally, set the variable to the path the executable was run from
+ // Finally, set the variable to the path the executable was run from.
IDOS->AddPart( apppath, appname, 1024);
IDOS->SetVar( apppath, progpath, -1, GVF_GLOBAL_ONLY|GVF_SAVE_VAR );
- // Turn system requesters back on
+ // Turn system requesters back on.
IDOS->SetProcWindow( oldwin );
}
}
- // Set up a stack cookie to avoid crashes from a stack set too low
- static const char *stack_cookie __attribute__((used)) = "$STACK: 600000";
+ // Set up a stack cookie to avoid crashes from a stack set too low.
+ static const char *stack_cookie __attribute__((used)) = "$STACK: 1024000";
- // Create our OSystem instance
+ // Create our OSystem instance.
g_system = new OSystem_AmigaOS();
assert(g_system);
- // Pre initialize the backend
+ // Pre-initialize the backend.
((OSystem_AmigaOS *)g_system)->init();
#ifdef DYNAMIC_MODULES
PluginManager::instance().addPluginProvider(new SDLPluginProvider());
#endif
- // Invoke the actual ScummVM main entry point
+ // Invoke the actual ScummVM main entry point.
int res = scummvm_main(argc, argv);
- // Free OSystem
+ // Free OSystem.
g_system->destroy();
return res;
Commit: 2afb56cdf4f21e67a60b25501a4cc128b6968775
https://github.com/scummvm/scummvm/commit/2afb56cdf4f21e67a60b25501a4cc128b6968775
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AMIGAOS4: Increase stack cookie
Just to be on the safe side.
Right now the binary consumes roughly 700 000 bytes.
Double that and add a a panic amount of roughly 50%, which leaves us at 2 MB.
Changed paths:
backends/platform/sdl/amigaos/amigaos-main.cpp
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp
index d0990a6..9149085 100644
--- a/backends/platform/sdl/amigaos/amigaos-main.cpp
+++ b/backends/platform/sdl/amigaos/amigaos-main.cpp
@@ -62,7 +62,7 @@ int main(int argc, char *argv[]) {
}
// Set up a stack cookie to avoid crashes from a stack set too low.
- static const char *stack_cookie __attribute__((used)) = "$STACK: 1024000";
+ static const char *stack_cookie __attribute__((used)) = "$STACK: 2048000";
// Create our OSystem instance.
g_system = new OSystem_AmigaOS();
Commit: 86ba632fe0963acd98fd94be5ddd56ae01a5e273
https://github.com/scummvm/scummvm/commit/86ba632fe0963acd98fd94be5ddd56ae01a5e273
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AMIGAOS4: more verbose debug comments
Changed paths:
backends/fs/amigaos4/amigaos4-fs.cpp
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index 5f77590..d840586 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -57,7 +57,7 @@ const char *lastPathComponent(const Common::String &str) {
AmigaOSFilesystemNode::AmigaOSFilesystemNode() {
ENTER();
- _sDisplayName = "Available Disks";
+ _sDisplayName = "Available HDDs/Partitions";
_bIsValid = true;
_bIsDirectory = true;
_sPath = "";
@@ -140,7 +140,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
if (IDOS->IoErr() != ERROR_LINE_TOO_LONG) {
_bIsValid = false;
- debug(6, "IoErr() != ERROR_LINE_TOO_LONG");
+ debug(6, "IDOS->IoErr() failed - ERROR_LINE_TOO_LONG not matched!");
LEAVE();
delete[] n;
return;
@@ -173,7 +173,7 @@ AmigaOSFilesystemNode::AmigaOSFilesystemNode(BPTR pLock, const char *pDisplayNam
IDOS->FreeDosObject(DOS_EXAMINEDATA, pExd);
} else {
- debug(6, "ExamineObject() returned NULL!");
+ debug(6, "IDOS->ExamineData() failed - ExamineDosObject returned NULL!");
}
LEAVE();
@@ -274,13 +274,13 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
return true;
}
- APTR context = IDOS->ObtainDirContextTags( EX_FileLockInput, _pFileLock,
- EX_DoCurrentDir, TRUE, /* for softlinks */
- EX_DataFields, (EXF_NAME|EXF_LINK|EXF_TYPE),
- TAG_END);
+ APTR context = IDOS->ObtainDirContextTags( EX_FileLockInput, _pFileLock,
+ EX_DoCurrentDir, TRUE, /* for softlinks */
+ EX_DataFields, (EXF_NAME|EXF_LINK|EXF_TYPE),
+ TAG_END);
if (context) {
struct ExamineData * pExd = NULL; // No need to free the value after usage, everything
- // will be dealt with by the DirContext release.
+ // will be dealt with by the DirContext release.
AmigaOSFilesystemNode *entry;
while ( (pExd = IDOS->ExamineDir(context)) ) {
@@ -311,7 +311,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
IDOS->ReleaseDirContext(context);
} else {
- debug(6, "Unable to ObtainDirContext!");
+ debug(6, "IDOS->ObtainDirContext() failed!");
ret = false;
}
@@ -390,7 +390,7 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
struct DosList *dosList = IDOS->LockDosList(kLockFlags);
if (!dosList) {
- debug(6, "Cannot LockDOSList!");
+ debug(6, "IDOS->LockDOSList() failed!");
LEAVE();
return myList;
}
Commit: 04b111db7003ab60394fda70aa93bd84e52ac57e
https://github.com/scummvm/scummvm/commit/04b111db7003ab60394fda70aa93bd84e52ac57e
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AMIGAOS4: Fix oversight
Changed paths:
backends/fs/amigaos4/amigaos4-fs.cpp
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index d840586..74068bc 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -302,7 +302,7 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
}
if (ERROR_NO_MORE_ENTRIES != IDOS->IoErr() ) {
- debug(6, "IoErr() - ExamineDir (NO_MORE_ENTRIES)!");
+ debug(6, "IDOS->IoErr() failed - ERROR_NO_MORE_ENTRIES!");
ret = false;
} else {
ret = true;
Commit: 1f5185f130aea029b00d04761d3cc999634ca101
https://github.com/scummvm/scummvm/commit/1f5185f130aea029b00d04761d3cc999634ca101
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2019-11-10T17:28:15Z
Commit Message:
AMIGAOS4: Formatting
Changed paths:
backends/fs/amigaos4/amigaos4-fs.cpp
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp
index 74068bc..46e289e 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -279,8 +279,8 @@ bool AmigaOSFilesystemNode::getChildren(AbstractFSList &myList, ListMode mode, b
EX_DataFields, (EXF_NAME|EXF_LINK|EXF_TYPE),
TAG_END);
if (context) {
- struct ExamineData * pExd = NULL; // No need to free the value after usage, everything
- // will be dealt with by the DirContext release.
+ // No need to free the value after usage, everything will be dealt with by the DirContext release.
+ struct ExamineData * pExd = NULL;
AmigaOSFilesystemNode *entry;
while ( (pExd = IDOS->ExamineDir(context)) ) {
More information about the Scummvm-git-logs
mailing list