loader: clang-tidy

Author: rpavlik

src/loader/api_layer_interface.cpp

@@ -37,7 +37,7 @@
 #define OPENXR_ENABLE_LAYERS_ENV_VAR "XR_ENABLE_API_LAYERS"
 
 // Add any layers defined in the loader layer environment variable.
-static void AddEnvironmentApiLayers(const std::string& openxr_command, std::vector<std::string>& enabled_layers) {
+static void AddEnvironmentApiLayers(std::vector<std::string>& enabled_layers) {
     std::string layers = PlatformUtilsGetEnv(OPENXR_ENABLE_LAYERS_ENV_VAR);
 
     std::size_t last_found = 0;
@@ -165,16 +165,16 @@ XrResult ApiLayerInterface::GetInstanceExtensionProperties(const std::string& op
             // Find any environmentally enabled explicit layers.  If they're present, treat them like implicit layers
             // since we know that they're going to be enabled.
             std::vector<std::string> env_enabled_layers;
-            AddEnvironmentApiLayers(openxr_command, env_enabled_layers);
+            AddEnvironmentApiLayers(env_enabled_layers);
             if (!env_enabled_layers.empty()) {
                 std::vector<std::unique_ptr<ApiLayerManifestFile>> exp_layer_man_files = {};
                 result = ApiLayerManifestFile::FindManifestFiles(MANIFEST_TYPE_EXPLICIT_API_LAYER, exp_layer_man_files);
                 if (XR_SUCCEEDED(result)) {
-                    for (auto exp_iter = exp_layer_man_files.begin(); exp_iter != exp_layer_man_files.end(); exp_iter++) {
+                    for (auto& exp_layer_man_file : exp_layer_man_files) {
                         for (std::string& enabled_layer : env_enabled_layers) {
                             // If this is an enabled layer, transfer it over to the manifest list.
-                            if (enabled_layer == (*exp_iter)->LayerName()) {
-                                manifest_files.push_back(std::move(*exp_iter));
+                            if (enabled_layer == exp_layer_man_file->LayerName()) {
+                                manifest_files.push_back(std::move(exp_layer_man_file));
                                 break;
                             }
                         }
@@ -209,7 +209,7 @@ XrResult ApiLayerInterface::LoadApiLayers(const std::string& openxr_command, uin
 
     // Put all the enabled layers into a string vector
     std::vector<std::string> enabled_api_layers = {};
-    AddEnvironmentApiLayers(openxr_command, enabled_api_layers);
+    AddEnvironmentApiLayers(enabled_api_layers);
     if (enabled_api_layer_count > 0) {
         if (nullptr == enabled_api_layer_names) {
             LoaderLogger::LogErrorMessage(

src/loader/loader_core.cpp

@@ -332,7 +332,7 @@ XRLOADER_ABI_CATCH_FALLBACK
 // ---- Core 1.0 manual loader terminator functions
 
 // Validate that the applicationInfo structure in the XrInstanceCreateInfo is valid.
-static XrResult ValidateApplicationInfo(LoaderInstance *loader_instance, const XrApplicationInfo &info) {
+static XrResult ValidateApplicationInfo(const XrApplicationInfo &info) {
     if (IsMissingNullTerminator<XR_MAX_APPLICATION_NAME_SIZE>(info.applicationName)) {
         LoaderLogger::LogValidationErrorMessage("VUID-XrApplicationInfo-applicationName-parameter", "xrCreateInstance",
                                                 "application name missing NULL terminator.");
@@ -352,7 +352,7 @@ static XrResult ValidateApplicationInfo(LoaderInstance *loader_instance, const X
 }
 
 // Validate that the XrInstanceCreateInfo is valid
-static XrResult ValidateInstanceCreateInfo(LoaderInstance *loader_instance, const XrInstanceCreateInfo *info) {
+static XrResult ValidateInstanceCreateInfo(const XrInstanceCreateInfo *info) {
     // Should have a valid 'type'
     if (XR_TYPE_INSTANCE_CREATE_INFO != info->type) {
         LoaderLogger::LogValidationErrorMessage("VUID-XrInstanceCreateInfo-type-type", "xrCreateInstance",
@@ -366,7 +366,7 @@ static XrResult ValidateInstanceCreateInfo(LoaderInstance *loader_instance, cons
         return XR_ERROR_VALIDATION_FAILURE;
     }
     // ApplicationInfo struct must be valid
-    XrResult result = ValidateApplicationInfo(loader_instance, info->applicationInfo);
+    XrResult result = ValidateApplicationInfo(info->applicationInfo);
     if (XR_FAILED(result)) {
         LoaderLogger::LogValidationErrorMessage("VUID-XrInstanceCreateInfo-applicationInfo-parameter", "xrCreateInstance",
                                                 "info->applicationInfo is not valid.");
@@ -384,7 +384,7 @@ static XrResult ValidateInstanceCreateInfo(LoaderInstance *loader_instance, cons
 XRAPI_ATTR XrResult XRAPI_CALL LoaderXrTermCreateInstance(const XrInstanceCreateInfo *info, XrInstance *instance) XRLOADER_ABI_TRY {
     LoaderLogger::LogVerboseMessage("xrCreateInstance", "Entering loader terminator");
     LoaderInstance *loader_instance = reinterpret_cast<LoaderInstance *>(*instance);
-    XrResult result = ValidateInstanceCreateInfo(loader_instance, info);
+    XrResult result = ValidateInstanceCreateInfo(info);
     if (XR_FAILED(result)) {
         LoaderLogger::LogValidationErrorMessage("VUID-xrCreateInstance-info-parameter", "xrCreateInstance",
                                                 "something wrong with XrInstanceCreateInfo contents");