Fix or ignore trivial clang/llvm warnings.
BUG: 21326225
BUG: 21118907
Change-Id: I3ac741a9648cfbddbc1fc1a9b24e2a4420fe2a15
diff --git a/qcwcn/wifi_hal/Android.mk b/qcwcn/wifi_hal/Android.mk
index 28ab42b..4022f19 100644
--- a/qcwcn/wifi_hal/Android.mk
+++ b/qcwcn/wifi_hal/Android.mk
@@ -20,6 +20,9 @@
LOCAL_CFLAGS := -Wno-unused-parameter
+# gscan.cpp: address of array 'cached_results[i].results' will always evaluate to 'true'
+LOCAL_CLANG_CFLAGS := -Wno-pointer-bool-conversion
+
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
external/libnl/include \
@@ -69,6 +72,9 @@
LOCAL_CFLAGS += -DNAN_2_0
LOCAL_CPPFLAGS += -Wno-conversion-null
+# gscan.cpp: address of array 'cached_results[i].results' will always evaluate to 'true'
+LOCAL_CLANG_CFLAGS := -Wno-pointer-bool-conversion
+
LOCAL_C_INCLUDES += \
$(LOCAL_PATH) \
external/libnl/include \
diff --git a/qcwcn/wifi_hal/tdls.cpp b/qcwcn/wifi_hal/tdls.cpp
index 92c4d7a..dcd1e16 100755
--- a/qcwcn/wifi_hal/tdls.cpp
+++ b/qcwcn/wifi_hal/tdls.cpp
@@ -333,7 +333,7 @@
nl_data = pTdlsCommand->attr_start(NL80211_ATTR_VENDOR_DATA);
if (!nl_data)
goto cleanup;
- ALOGD("%s: MAC_ADDR: "MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
+ ALOGD("%s: MAC_ADDR: " MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
ret = pTdlsCommand->put_bytes(QCA_WLAN_VENDOR_ATTR_TDLS_ENABLE_MAC_ADDR,
(char *)addr, 6);
if (ret < 0)
@@ -410,7 +410,7 @@
if (ret < 0)
goto cleanup;
ALOGD("%s: ifindex obtained:%d", __FUNCTION__, ret);
- ALOGD("%s: MAC_ADDR: "MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
+ ALOGD("%s: MAC_ADDR: " MAC_ADDR_STR, __FUNCTION__, MAC_ADDR_ARRAY(addr));
/* Add the attributes */
nl_data = pTdlsCommand->attr_start(NL80211_ATTR_VENDOR_DATA);