[Scummvm-git-logs] scummvm master -> 093d88f8a91ea2d6dc836a7365237584e78caaaf
tnm23
noreply at scummvm.org
Mon Jul 28 06:47:32 UTC 2025
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
093d88f8a9 COMMON: Change error message to warning in SearchSet.addDirectory().
Commit: 093d88f8a91ea2d6dc836a7365237584e78caaaf
https://github.com/scummvm/scummvm/commit/093d88f8a91ea2d6dc836a7365237584e78caaaf
Author: Thomas N McEwan (46427621+tnm23 at users.noreply.github.com)
Date: 2025-07-28T07:45:53+01:00
Commit Message:
COMMON: Change error message to warning in SearchSet.addDirectory().
Split into two different possible warnings for clarity.
Changed paths:
common/archive.cpp
diff --git a/common/archive.cpp b/common/archive.cpp
index b30f62d8653..1289436fb83 100644
--- a/common/archive.cpp
+++ b/common/archive.cpp
@@ -358,8 +358,12 @@ void SearchSet::addDirectory(const String &name, const Path &directory, int prio
}
void SearchSet::addDirectory(const String &name, const FSNode &dir, int priority, int depth, bool flat) {
- if (!dir.exists() || !dir.isDirectory()) {
- error("Failed to add directory %s", name.c_str());
+ if (!dir.exists()) {
+ warning("SearchSet::addDirectory: %s does not exist.", name.c_str());
+ return;
+ }
+ if (!dir.isDirectory()) {
+ warning("SearchSet::addDirectory: %s is not a directory.", name.c_str());
return;
}
More information about the Scummvm-git-logs
mailing list