From 91b85f4715990437d728bfd80266cd7eb9f09866 Mon Sep 17 00:00:00 2001
From: Jamie Madill <jmadill@chromium.org>
Date: Wed, 14 Dec 2016 17:21:43 -0500
Subject: [PATCH] loader: Fix Clang warnings.

error: equality comparison with extraneous parentheses
error: comparison of array equal to a null pointer is always false
error: using namespace directive in global context in header

Change-Id: I52b5d9062653b9429b9c42b40eca54e71b6d794b
---
 loader/loader.c             | 11 ++++-------
 loader/vk_loader_platform.h |  1 -
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/loader/loader.c b/loader/loader.c
index 85b5f48..2ed52c4 100644
--- a/loader/loader.c
+++ b/loader/loader.c
@@ -3799,8 +3799,7 @@ VkResult loader_create_instance_chain(const VkInstanceCreateInfo *pCreateInfo,
                 continue;
             if ((fpGIPA = layer_prop->functions.get_instance_proc_addr) ==
                 NULL) {
-                if (layer_prop->functions.str_gipa == NULL ||
-                    strlen(layer_prop->functions.str_gipa) == 0) {
+                if (strlen(layer_prop->functions.str_gipa) == 0) {
                     fpGIPA = (PFN_vkGetInstanceProcAddr)
                         loader_platform_get_proc_address(
                             lib_handle, "vkGetInstanceProcAddr");
@@ -3914,8 +3913,7 @@ loader_create_device_chain(const struct loader_physical_device_tramp *pd,
                 continue;
             if ((fpGIPA = layer_prop->functions.get_instance_proc_addr) ==
                 NULL) {
-                if (layer_prop->functions.str_gipa == NULL ||
-                    strlen(layer_prop->functions.str_gipa) == 0) {
+                if (strlen(layer_prop->functions.str_gipa) == 0) {
                     fpGIPA = (PFN_vkGetInstanceProcAddr)
                         loader_platform_get_proc_address(
                             lib_handle, "vkGetInstanceProcAddr");
@@ -3933,8 +3931,7 @@ loader_create_device_chain(const struct loader_physical_device_tramp *pd,
                 }
             }
             if ((fpGDPA = layer_prop->functions.get_device_proc_addr) == NULL) {
-                if (layer_prop->functions.str_gdpa == NULL ||
-                    strlen(layer_prop->functions.str_gdpa) == 0) {
+                if (strlen(layer_prop->functions.str_gdpa) == 0) {
                     fpGDPA = (PFN_vkGetDeviceProcAddr)
                         loader_platform_get_proc_address(lib_handle,
                                                          "vkGetDeviceProcAddr");
@@ -4464,7 +4461,7 @@ VKAPI_ATTR VkResult VKAPI_CALL terminator_EnumeratePhysicalDevices(
         }
         res = icd_term->EnumeratePhysicalDevices(
             icd_term->instance, &(phys_devs[i].count), phys_devs[i].phys_devs);
-        if ((res == VK_SUCCESS)) {
+        if (res == VK_SUCCESS) {
             inst->total_gpu_count += phys_devs[i].count;
         } else {
             return res;
diff --git a/loader/vk_loader_platform.h b/loader/vk_loader_platform.h
index 4c48090..a2649f0 100644
--- a/loader/vk_loader_platform.h
+++ b/loader/vk_loader_platform.h
@@ -234,7 +234,6 @@ loader_platform_thread_cond_broadcast(loader_platform_thread_cond *pCond) {
 #ifdef __cplusplus
 #include <iostream>
 #include <string>
-using namespace std;
 #endif // __cplusplus
 
 // VK Library Filenames, Paths, etc.:
-- 
2.7.4