[Scummvm-cvs-logs] scummvm master -> 71e95fa3400c5c228fcec6e43f88dc2fbdb0e0e5

digitall dgturner at iee.org
Fri Jan 30 13:51:56 CET 2015


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

Summary:
5eefa62899 AMIGAOS: Re-add a DosList feature
71e95fa340 Merge pull request #573 from raziel-/patch-3


Commit: 5eefa62899950ea9e1644a2f597fcfa6b9ad50b9
    https://github.com/scummvm/scummvm/commit/5eefa62899950ea9e1644a2f597fcfa6b9ad50b9
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2015-01-26T19:56:24+02:00

Commit Message:
AMIGAOS: Re-add a DosList feature

To keep consistency with the original code i re-added the DosList feature dol_Port (which was taken out due to a compiler error using SDK 53.24 and was named wrong anyway).
It offers a message port for the DosList.

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 7bebdf8..6d5b099 100644
--- a/backends/fs/amigaos4/amigaos4-fs.cpp
+++ b/backends/fs/amigaos4/amigaos4-fs.cpp
@@ -381,15 +381,17 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const {
 	dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES);
 	while (dosList) {
 		if (dosList->dol_Type == DLT_VOLUME &&
-			dosList->dol_Name) {
+			dosList->dol_Name &&
+			dosList->dol_Port) {
 
 			// The original line was
 			//if (dosList->dol_Type == DLT_VOLUME &&
 			//dosList->dol_Name &&
 			//dosList->dol_Task) {
 			// which errored using SDK 53.24 with a 'struct dosList' has no member called 'dol_Task'
-			// I removed dol_Task because it's not used anywhere else
-			// and it neither brought up further errors nor crashes or regressions
+			// The reason for that was that
+			// 1) dol_Task wasn't a task pointer, it is a message port instead
+			// 2) It was redefined to be dol_Port in dos/obsolete.h in afore mentioned SDK
 
 			// Copy name to buffer
 			IDOS->CopyStringBSTRToC(dosList->dol_Name, buffer, MAXPATHLEN);


Commit: 71e95fa3400c5c228fcec6e43f88dc2fbdb0e0e5
    https://github.com/scummvm/scummvm/commit/71e95fa3400c5c228fcec6e43f88dc2fbdb0e0e5
Author: David Turner (dgturner at iee.org)
Date: 2015-01-30T12:50:58Z

Commit Message:
Merge pull request #573 from raziel-/patch-3

AMIGAOS: Re-add a DosList feature

Changed paths:
    backends/fs/amigaos4/amigaos4-fs.cpp









More information about the Scummvm-git-logs mailing list