Skip to content

Commit 5a51e7b

Browse files
committed
loader: Remove unused parameters
1 parent 9f4a751 commit 5a51e7b

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/loader/manifest_file.cpp

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,8 @@ static void ReadDataFilesInSearchPaths(ManifestFileType type, const std::string
247247
relative_home_path += relative_path;
248248
CopyIncludedPaths(true, home, relative_home_path, search_path);
249249
}
250-
250+
#else
251+
(void)relative_path;
251252
#endif
252253
}
253254

@@ -333,7 +334,7 @@ static bool FindXDGConfigFile(const std::string &relative_path, std::string &out
333334

334335
// Look for runtime data files in the provided paths, but first check the environment override to determine
335336
// if we should use that instead.
336-
static void ReadRuntimeDataFilesInRegistry(ManifestFileType type, const std::string &runtime_registry_location,
337+
static void ReadRuntimeDataFilesInRegistry(const std::string &runtime_registry_location,
337338
const std::string &default_runtime_value_name,
338339
std::vector<std::string> &manifest_files) {
339340
HKEY hkey;
@@ -354,21 +355,21 @@ static void ReadRuntimeDataFilesInRegistry(ManifestFileType type, const std::str
354355
LONG open_value = RegOpenKeyExW(HKEY_LOCAL_MACHINE, full_registry_location_w.c_str(), 0, access_flags, &hkey);
355356

356357
if (ERROR_SUCCESS != open_value) {
357-
LoaderLogger::LogWarningMessage("", "ReadLayerDataFilesInRegistry - failed to open registry key " + full_registry_location);
358+
LoaderLogger::LogWarningMessage("",
359+
"ReadRuntimeDataFilesInRegistry - failed to open registry key " + full_registry_location);
358360
} else if (ERROR_SUCCESS != RegGetValueW(hkey, nullptr, default_runtime_value_name_w.c_str(),
359361
RRF_RT_REG_SZ | REG_EXPAND_SZ | RRF_ZEROONFAILURE, NULL,
360362
reinterpret_cast<LPBYTE>(&value_w), &value_size_w)) {
361363
LoaderLogger::LogWarningMessage(
362-
"", "ReadLayerDataFilesInRegistry - failed to read registry value " + default_runtime_value_name);
364+
"", "ReadRuntimeDataFilesInRegistry - failed to read registry value " + default_runtime_value_name);
363365
} else {
364366
AddFilesInPath(wide_to_utf8(value_w), false, manifest_files);
365367
}
366368
}
367369

368370
// Look for layer data files in the provided paths, but first check the environment override to determine
369371
// if we should use that instead.
370-
static void ReadLayerDataFilesInRegistry(ManifestFileType type, const std::string &registry_location,
371-
std::vector<std::string> &manifest_files) {
372+
static void ReadLayerDataFilesInRegistry(const std::string &registry_location, std::vector<std::string> &manifest_files) {
372373
const std::wstring full_registry_location_w =
373374
utf8_to_wide(OPENXR_REGISTRY_LOCATION + std::to_string(XR_VERSION_MAJOR(XR_CURRENT_API_VERSION)) + registry_location);
374375

@@ -618,7 +619,7 @@ XrResult RuntimeManifestFile::FindManifestFiles(ManifestFileType type,
618619
} else {
619620
#ifdef XR_OS_WINDOWS
620621
std::vector<std::string> filenames;
621-
ReadRuntimeDataFilesInRegistry(type, "", "ActiveRuntime", filenames);
622+
ReadRuntimeDataFilesInRegistry("", "ActiveRuntime", filenames);
622623
if (filenames.size() == 0) {
623624
LoaderLogger::LogErrorMessage(
624625
"", "RuntimeManifestFile::FindManifestFiles - failed to find active runtime file in registry");
@@ -838,7 +839,7 @@ XrResult ApiLayerManifestFile::FindManifestFiles(ManifestFileType type,
838839
#ifdef XR_OS_WINDOWS
839840
// Read the registry if the override wasn't active.
840841
if (!override_active) {
841-
ReadLayerDataFilesInRegistry(type, registry_location, filenames);
842+
ReadLayerDataFilesInRegistry(registry_location, filenames);
842843
}
843844
#endif
844845

0 commit comments

Comments
 (0)