Merged SFMError into Common::Error, added some new error codes; revised some error handling in DefaultSaveManager

svn-id: r34915

2 files changed, 47 insertions, 41 deletions

diff --git a/backends/saves/default/default-saves.cpp b/backends/saves/default/default-saves.cpp
index 9a0ff484ce..c15463e7bb 100644
--- a/backends/saves/default/default-saves.cpp
+++ b/backends/saves/default/default-saves.cpp
@@ -44,8 +44,21 @@ DefaultSaveFileManager::DefaultSaveFileManager(const Common::String &defaultSave
 }
 
 
+void DefaultSaveFileManager::checkPath(const Common::FSNode &dir) {
+	clearError();
+	if (!dir.exists()) {
+		setError(Common::kPathDoesNotExist, "The savepath '"+dir.getPath()+"' does not exist");
+	} else if (!dir.isDirectory()) {
+		setError(Common::kPathNotDirectory, "The savepath '"+dir.getPath()+"' is not a directory");
+	}
+}
+
 Common::StringList DefaultSaveFileManager::listSavefiles(const char *pattern) {
 	Common::FSNode savePath(getSavePath());
+	checkPath(savePath);
+	if (getError() != Common::kNoError)
+		return Common::StringList();
+
 	Common::FSList savefiles;
 	Common::StringList results;
 	Common::String search(pattern);
@@ -59,63 +72,56 @@ Common::StringList DefaultSaveFileManager::listSavefiles(const char *pattern) {
 	return results;
 }
 
-void DefaultSaveFileManager::checkPath(const Common::FSNode &dir) {
-	clearError();
-	if (!dir.exists()) {
-		setError(SFM_DIR_NOENT, "A component of the path does not exist, or the path is an empty string: "+dir.getPath());
-	} else if (!dir.isDirectory()) {
-		setError(SFM_DIR_NOTDIR, "The given savepath is not a directory: "+dir.getPath());
-	}
-}
-
 Common::InSaveFile *DefaultSaveFileManager::openForLoading(const char *filename) {
 	// Ensure that the savepath is valid. If not, generate an appropriate error.
 	Common::FSNode savePath(getSavePath());
 	checkPath(savePath);
+	if (getError() != Common::kNoError)
+		return 0;
 
-	if (getError() == SFM_NO_ERROR) {
-		Common::FSNode file = savePath.getChild(filename);
+	Common::FSNode file = savePath.getChild(filename);
 
-		// Open the file for reading
-		Common::SeekableReadStream *sf = file.openForReading();
+	// Open the file for reading
+	Common::SeekableReadStream *sf = file.openForReading();
 
-		return wrapInSaveFile(sf);
-	} else {
-		return 0;
-	}
+	return wrapInSaveFile(sf);
 }
 
 Common::OutSaveFile *DefaultSaveFileManager::openForSaving(const char *filename) {
 	// Ensure that the savepath is valid. If not, generate an appropriate error.
 	Common::FSNode savePath(getSavePath());
 	checkPath(savePath);
+	if (getError() != Common::kNoError)
+		return 0;
 
-	if (getError() == SFM_NO_ERROR) {
-		Common::FSNode file = savePath.getChild(filename);
+	Common::FSNode file = savePath.getChild(filename);
 
-		// Open the file for saving
-		Common::WriteStream *sf = file.openForWriting();
+	// Open the file for saving
+	Common::WriteStream *sf = file.openForWriting();
 
-		return wrapOutSaveFile(sf);
-	} else {
-		return 0;
-	}
+	return wrapOutSaveFile(sf);
 }
 
 bool DefaultSaveFileManager::removeSavefile(const char *filename) {
 	clearError();
 
 	Common::FSNode savePath(getSavePath());
-	Common::FSNode file = savePath.getChild(filename);
+	checkPath(savePath);
+	if (getError() != Common::kNoError)
+		return false;
 
-	// TODO: Add new method FSNode::remove()
+	Common::FSNode file = savePath.getChild(filename);
+	
+	// FIXME: remove does not exist on all systems. If your port fails to
+	// compile because of this, please let us know (scummvm-devel or Fingolfin).
+	// There is a nicely portable workaround, too: Make this method overloadable.
 	if (remove(file.getPath().c_str()) != 0) {
 #ifndef _WIN32_WCE
 		if (errno == EACCES)
-			setError(SFM_DIR_ACCESS, "Search or write permission denied: "+file.getName());
+			setError(Common::kWritePermissionDenied, "Search or write permission denied: "+file.getName());
 
 		if (errno == ENOENT)
-			setError(SFM_DIR_NOENT, "A component of the path does not exist, or the path is an empty string: "+file.getName());
+			setError(Common::kPathDoesNotExist, "removeSavefile: '"+file.getName()+"' does not exist or path is invalid");
 #endif
 		return false;
 	} else {
diff --git a/backends/saves/posix/posix-saves.cpp b/backends/saves/posix/posix-saves.cpp
index 38d811789f..2466f3d8d9 100644
--- a/backends/saves/posix/posix-saves.cpp
+++ b/backends/saves/posix/posix-saves.cpp
@@ -72,13 +72,13 @@ void POSIXSaveFileManager::checkPath(const Common::FSNode &dir) {
 		// to create the dir (ENOENT case).
 		switch (errno) {
 		case EACCES:
-			setError(SFM_DIR_ACCESS, "Search or write permission denied: "+path);
+			setError(Common::kWritePermissionDenied, "Search or write permission denied: "+path);
 			break;
 		case ELOOP:
-			setError(SFM_DIR_LOOP, "Too many symbolic links encountered while traversing the path: "+path);
+			setError(Common::kUnknownError, "Too many symbolic links encountered while traversing the path: "+path);
 			break;
 		case ENAMETOOLONG:
-			setError(SFM_DIR_NAMETOOLONG, "The path name is too long: "+path);
+			setError(Common::kUnknownError, "The path name is too long: "+path);
 			break;
 		case ENOENT:
 			if (mkdir(path.c_str(), 0755) != 0) {
@@ -89,37 +89,37 @@ void POSIXSaveFileManager::checkPath(const Common::FSNode &dir) {
 
 				switch (errno) {
 				case EACCES:
-					setError(SFM_DIR_ACCESS, "Search or write permission denied: "+path);
+					setError(Common::kWritePermissionDenied, "Search or write permission denied: "+path);
 					break;
 				case EMLINK:
-					setError(SFM_DIR_LINKMAX, "The link count of the parent directory would exceed {LINK_MAX}: "+path);
+					setError(Common::kUnknownError, "The link count of the parent directory would exceed {LINK_MAX}: "+path);
 					break;
 				case ELOOP:
-					setError(SFM_DIR_LOOP, "Too many symbolic links encountered while traversing the path: "+path);
+					setError(Common::kUnknownError, "Too many symbolic links encountered while traversing the path: "+path);
 					break;
 				case ENAMETOOLONG:
-					setError(SFM_DIR_NAMETOOLONG, "The path name is too long: "+path);
+					setError(Common::kUnknownError, "The path name is too long: "+path);
 					break;
 				case ENOENT:
-					setError(SFM_DIR_NOENT, "A component of the path does not exist, or the path is an empty string: "+path);
+					setError(Common::kPathDoesNotExist, "A component of the path does not exist, or the path is an empty string: "+path);
 					break;
 				case ENOTDIR:
-					setError(SFM_DIR_NOTDIR, "A component of the path prefix is not a directory: "+path);
+					setError(Common::kPathDoesNotExist, "A component of the path prefix is not a directory: "+path);
 					break;
 				case EROFS:
-					setError(SFM_DIR_ROFS, "The parent directory resides on a read-only file system:"+path);
+					setError(Common::kWritePermissionDenied, "The parent directory resides on a read-only file system:"+path);
 					break;
 				}
 			}
 			break;
 		case ENOTDIR:
-			setError(SFM_DIR_NOTDIR, "A component of the path prefix is not a directory: "+path);
+			setError(Common::kPathDoesNotExist, "A component of the path prefix is not a directory: "+path);
 			break;
 		}
 	} else {
 		// So stat() succeeded. But is the path actually pointing to a directory?
 		if (!S_ISDIR(sb.st_mode)) {
-			setError(SFM_DIR_NOTDIR, "The given savepath is not a directory: "+path);
+			setError(Common::kPathDoesNotExist, "The given savepath is not a directory: "+path);
 		}
 	}
 }