Skip to content
Permalink
Browse files

Remove exception name comments as requested to by reviewer for pull r…

…equest.
  • Loading branch information...
gmcode committed Feb 7, 2015
1 parent 12f44f0 commit 6593545ff68e8964c23d8686e51e0b84dbf77a2d
Showing with 14 additions and 14 deletions.
  1. +10 −10 src/common/FileSystem.cpp
  2. +1 −1 src/engine/client/cl_cgame.cpp
  3. +3 −3 src/engine/qcommon/files.cpp
@@ -2085,7 +2085,7 @@ static void FindPaksInPath(Str::StringRef basePath, Str::StringRef subPath)
} else if (Str::IsSuffix("/", filename))
FindPaksInPath(basePath, Path::Build(subPath, filename));
}
} catch (std::system_error& /*err*/) {
} catch (std::system_error&) {
// If there was an error reading a directory, just ignore it and go to
// the next one.
}
@@ -2325,7 +2325,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
IPC::HandleMsg<VM::FSHomePathOpenModeMsg>(channel, std::move(reader), [](std::string path, uint32_t mode, Util::optional<IPC::FileHandle>& out) {
try {
out = FileToIPC(HomePath::OpenMode(path, static_cast<openMode_t>(mode), throws()), static_cast<openMode_t>(mode));
} catch (std::system_error& /*err*/) {}
} catch (std::system_error&) {}
});
break;

@@ -2339,7 +2339,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
IPC::HandleMsg<VM::FSHomePathTimestampMsg>(channel, std::move(reader), [](std::string path, Util::optional<uint64_t>& out) {
try {
out = std::chrono::system_clock::to_time_t(HomePath::FileTimestamp(path));
} catch (std::system_error& /*err*/) {}
} catch (std::system_error&) {}
});
break;

@@ -2348,7 +2348,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
try {
HomePath::MoveFile(dest, src);
success = true;
} catch (std::system_error& /*err*/) {
} catch (std::system_error&) {
success = false;
}
});
@@ -2359,7 +2359,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
try {
HomePath::DeleteFile(path);
success = true;
} catch (std::system_error& /*err*/) {
} catch (std::system_error&) {
success = false;
}
});
@@ -2372,7 +2372,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
for (auto&& x: FS::HomePath::ListFiles(path))
vec.push_back(std::move(x));
out = std::move(vec);
} catch (std::system_error& /*err*/) {}
} catch (std::system_error&) {}
});
break;

@@ -2383,7 +2383,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
for (auto&& x: FS::HomePath::ListFilesRecursive(path))
vec.push_back(std::move(x));
out = std::move(vec);
} catch (std::system_error& /*err*/) {}
} catch (std::system_error&) {}
});
break;

@@ -2398,7 +2398,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
return;
try {
out = FileToIPC(RawPath::OpenRead(Path::Build(loadedPaks[pakIndex].path, path)), MODE_READ);
} catch (std::system_error& /*err*/) {}
} catch (std::system_error&) {}
});
break;

@@ -2413,7 +2413,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
return;
try {
out = std::chrono::system_clock::to_time_t(RawPath::FileTimestamp(Path::Build(loadedPaks[pakIndex].path, path)));
} catch (std::system_error& /*err*/) {}
} catch (std::system_error&) {}
});
break;

@@ -2423,7 +2423,7 @@ void HandleFileSystemSyscall(int minor, IPC::Reader& reader, IPC::Channel& chann
return;
try {
FS::PakPath::InternalLoadPak(availablePaks[pakIndex], expectedChecksum, pathPrefix, FS::throws());
} catch (std::system_error& /*err*/) {}
} catch (std::system_error&) {}
});
break;

@@ -1523,7 +1523,7 @@ intptr_t CL_CgameSystemCalls( intptr_t *args )
case CG_FS_LOADPAK:
try {
FS::PakPath::LoadPakPrefix( *FS::FindPak( ( const char * ) VMA( 1 ) ), ( const char * ) VMA( 2 ) );
} catch (std::system_error& /*err*/) {
} catch (std::system_error&) {
return 0;
}
return 1;
@@ -621,7 +621,7 @@ void FS_LoadAllMapMetadata()
for (auto& x: maps) {
try {
FS::PakPath::LoadPakPrefix(*FS::FindPak(x), va("meta/%s/", x.substr(4).c_str()));
} catch (std::system_error& /*err*/) {} // ignore and move on
} catch (std::system_error&) {} // ignore and move on
}
}

@@ -765,7 +765,7 @@ class DirCmd: public Cmd::StaticCmd {
Print("%s", filename.c_str());
}
}
} catch (std::system_error& /*err*/) {
} catch (std::system_error&) {
Print("^1ERROR^7: Path does not exist");
}

@@ -778,7 +778,7 @@ class DirCmd: public Cmd::StaticCmd {
Print("%s", filename.c_str());
}
}
} catch (std::system_error& /*err*/) {
} catch (std::system_error&) {
Print("^1ERROR^7: Path does not exist");
}

0 comments on commit 6593545

Please sign in to comment.
You can’t perform that action at this time.