From 748669257305916de98c983a758f0934c722ad84 Mon Sep 17 00:00:00 2001
From: Vivien Nicolas <vnicolas@apple.com>
Date: Thu, 12 Nov 2020 21:48:35 +0100
Subject: [PATCH] Remove '-Wno-maybe-uninitialized' from compiler flags (#3797)

---
 build/config/compiler/BUILD.gn          |  1 -
 src/platform/qpg6100/BLEManagerImpl.cpp | 12 +++++-------
 third_party/efr32_sdk/efr32_sdk.gni     |  2 ++
 third_party/lwip/lwip.gni               |  1 +
 third_party/mbedtls/mbedtls.gni         | 11 +++++++++++
 5 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 9d86780ec9fb30..f0b5ab3bb72b91 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -151,7 +151,6 @@ config("disabled_warnings") {
     cflags += [
       "-Wno-psabi",
       "-Wno-cast-function-type",
-      "-Wno-maybe-uninitialized",
     ]
   }
 }
diff --git a/src/platform/qpg6100/BLEManagerImpl.cpp b/src/platform/qpg6100/BLEManagerImpl.cpp
index 7969ffe5826c3f..bd1c99a22dc8e0 100644
--- a/src/platform/qpg6100/BLEManagerImpl.cpp
+++ b/src/platform/qpg6100/BLEManagerImpl.cpp
@@ -140,17 +140,16 @@ CHIP_ERROR BLEManagerImpl::_GetDeviceName(char * buf, size_t bufSize)
 
 CHIP_ERROR BLEManagerImpl::_SetDeviceName(const char * devName)
 {
-    CHIP_ERROR err;
+    CHIP_ERROR err = CHIP_NO_ERROR;
+
+    VerifyOrExit(mServiceMode != ConnectivityManager::kCHIPoBLEServiceMode_NotSupported, err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE);
 
-    if (mServiceMode == ConnectivityManager::kCHIPoBLEServiceMode_NotSupported)
-    {
-        return CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
-    }
     if (devName != nullptr && devName[0] != 0)
     {
         err = qvCHIP_BleSetDeviceName(devName);
     }
 
+exit:
     return err;
 }
 
@@ -230,13 +229,12 @@ bool BLEManagerImpl::SendIndication(BLE_CONNECTION_OBJECT conId, const ChipBleUU
     CHIP_ERROR err = CHIP_ERROR_UNSUPPORTED_CHIP_FEATURE;
     bool isRxHandle;
     uint16_t cId;
-    uint16_t dataLen;
+    uint16_t dataLen = data->DataLength();
 
     VerifyOrExit(IsSubscribed(conId), err = CHIP_ERROR_INVALID_ARGUMENT);
     ChipLogDetail(DeviceLayer, "Sending indication for CHIPoBLE TX characteristic (con %u, len %u)", conId, dataLen);
 
     isRxHandle = UUIDsMatch(&chipUUID_CHIPoBLEChar_RX, charId);
-    dataLen    = data->DataLength();
     cId        = qvCHIP_BleGetHandle(isRxHandle);
 
     qvCHIP_TxData(conId, cId, dataLen, data->Start());
diff --git a/third_party/efr32_sdk/efr32_sdk.gni b/third_party/efr32_sdk/efr32_sdk.gni
index bfad29a7a9d8f7..59cbd6afbc8dd2 100644
--- a/third_party/efr32_sdk/efr32_sdk.gni
+++ b/third_party/efr32_sdk/efr32_sdk.gni
@@ -169,6 +169,8 @@ template("efr32_sdk") {
       cflags += [ "-isystem" + rebase_path(include_dir, root_build_dir) ]
     }
 
+    cflags += [ "-Wno-maybe-uninitialized" ]
+
     if (defined(invoker.defines)) {
       defines += invoker.defines
     }
diff --git a/third_party/lwip/lwip.gni b/third_party/lwip/lwip.gni
index a8fc73ca3a4ee6..76f75dc4b58cbc 100644
--- a/third_party/lwip/lwip.gni
+++ b/third_party/lwip/lwip.gni
@@ -88,6 +88,7 @@ template("lwip_target") {
       "-Wno-format",
       "-Wno-type-limits",
       "-Wno-unused-variable",
+      "-Wno-maybe-uninitialized",
     ]
   }
 
diff --git a/third_party/mbedtls/mbedtls.gni b/third_party/mbedtls/mbedtls.gni
index 2a2cd0c98d03e5..85dd8372c6afc5 100644
--- a/third_party/mbedtls/mbedtls.gni
+++ b/third_party/mbedtls/mbedtls.gni
@@ -19,6 +19,10 @@ template("mbedtls_target") {
 
   _mbedtls_root = "${mbedtls_root}/repo"
 
+  config("${mbedtls_target_name}_warnings") {
+    cflags = [ "-Wno-maybe-uninitialized" ]
+  }
+
   config("${mbedtls_target_name}_config") {
     include_dirs = [ "${_mbedtls_root}/include" ]
   }
@@ -106,6 +110,13 @@ template("mbedtls_target") {
       sources += [ "${_mbedtls_root}/library/timing.c" ]
     }
 
+    if (!defined(configs)) {
+      configs = []
+    }
+
+    # Relax warnings for third_party code.
+    configs += [ ":${mbedtls_target_name}_warnings" ]
+
     if (!defined(public_configs)) {
       public_configs = []
     }