Fix more mutable string constants

Fix static variables inside functions not named in kConstantNamingStyle: find . -name .git -prune -o -name .environment -prune -o -name third_party -prune -o -name zzz_generated -prune -o -name out -prune -o -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's,^\( *\)\(static \|extern \)\(inline \|\)\(constexpr \|\)const char *\* * \([^][ ;()]*\)\( *= *"\|;\),\1\2\3\4const char \5[]\6,g' {} + Fix file scoped variables not named named in kConstantNamingStyle: find . -name .git -prune -o -name .environment -prune -o -name third_party -prune -o -name zzz_generated -prune -o -name out -prune -o -type f \( -name '*.cpp' -o -name '*.h' \) -exec sed -i 's,^\(\)\(static \|extern \|\)\(inline \|\)\(constexpr \|\)const char *\* * \([^][ ;()]*\)\( *= *"\|;\),\1\2\3\4const char \5[]\6,g' {} +
mspang · Dec 5, 2023 · b6c264a · b6c264a
1 parent 1129dd4
commit b6c264a
Show file tree

Hide file tree

Showing 66 changed files with 84 additions and 84 deletions.
diff --git a/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp b/examples/air-purifier-app/ameba/main/DeviceCallbacks.cpp
@@ -43,7 +43,7 @@
 #include <ota/OTAInitializer.h>
 #endif
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-app/ameba/main/DeviceCallbacks.cpp
@@ -45,7 +45,7 @@
 #include "Globals.h"
 #include "LEDWidget.h"
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/all-clusters-app/esp32/main/AppTask.cpp b/examples/all-clusters-app/esp32/main/AppTask.cpp
@@ -42,7 +42,7 @@
 #define APP_EVENT_QUEUE_SIZE 10
 #define APP_TASK_STACK_SIZE (3072)
 
-static const char * TAG = "app-task";
+static const char TAG[] = "app-task";
 
 namespace {
 TimerHandle_t sFunctionTimer; // FreeRTOS app sw timer

diff --git a/examples/all-clusters-app/esp32/main/BluetoothWidget.cpp b/examples/all-clusters-app/esp32/main/BluetoothWidget.cpp
@@ -31,7 +31,7 @@
 #include "ScreenManager.h"
 #endif
 
-extern const char * TAG;
+extern const char TAG[];
 
 void BluetoothWidget::Init()
 {

diff --git a/examples/all-clusters-app/esp32/main/Button.cpp b/examples/all-clusters-app/esp32/main/Button.cpp
@@ -35,7 +35,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <vector>
 
-static const char * TAG = "Button.cpp";
+static const char TAG[] = "Button.cpp";
 
 extern Button gButtons[BUTTON_NUMBER];
 

diff --git a/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-app/esp32/main/DeviceCallbacks.cpp
@@ -41,7 +41,7 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #endif
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-app/esp32/main/DeviceWithDisplay.cpp
@@ -28,7 +28,7 @@ using namespace ::chip::Credentials;
 using namespace ::chip::DeviceManager;
 using namespace ::chip::DeviceLayer;
 
-static const char * TAG = "DeviceWithDisplay";
+static const char TAG[] = "DeviceWithDisplay";
 
 #if CONFIG_DEVICE_TYPE_M5STACK
 

diff --git a/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp b/examples/all-clusters-app/esp32/main/QRCodeScreen.cpp
@@ -43,7 +43,7 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
 // TODO need sensible library tag when put in library
-extern const char * TAG;
+extern const char TAG[];
 
 namespace {
 

diff --git a/examples/all-clusters-app/esp32/main/WiFiWidget.cpp b/examples/all-clusters-app/esp32/main/WiFiWidget.cpp
@@ -31,7 +31,7 @@
 #include "ScreenManager.h"
 #endif
 
-extern const char * TAG;
+extern const char TAG[];
 
 void WiFiWidget::Init()
 {

diff --git a/examples/all-clusters-app/esp32/main/main.cpp b/examples/all-clusters-app/esp32/main/main.cpp
@@ -72,7 +72,7 @@ using namespace ::chip::Credentials;
 // Used to indicate that an IP address has been added to the QRCode
 #define EXAMPLE_VENDOR_TAG_IP 1
 
-const char * TAG = "all-clusters-app";
+extern const char TAG[] = "all-clusters-app";
 
 static AppDeviceCallbacks EchoCallbacks;
 static AppDeviceCallbacksDelegate sAppDeviceCallbacksDelegate;

diff --git a/examples/all-clusters-app/nxp/mw320/main.cpp b/examples/all-clusters-app/nxp/mw320/main.cpp
@@ -111,7 +111,7 @@ enum
 };
 static int Matter_Selection = MAX_SELECTION;
 #define RUN_RST_LT_DELAY 10
-static const char * TAG = "mw320";
+static const char TAG[] = "mw320";
 
 /*******************************************************************************
  * Variables

diff --git a/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/ameba/main/DeviceCallbacks.cpp
@@ -40,7 +40,7 @@
 #include "Globals.h"
 #include "LEDWidget.h"
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp b/examples/all-clusters-minimal-app/esp32/main/AppTask.cpp
@@ -41,7 +41,7 @@
 #define APP_EVENT_QUEUE_SIZE 10
 #define APP_TASK_STACK_SIZE (3072)
 
-static const char * TAG = "app-task";
+static const char TAG[] = "app-task";
 
 namespace {
 

diff --git a/examples/all-clusters-minimal-app/esp32/main/BluetoothWidget.cpp b/examples/all-clusters-minimal-app/esp32/main/BluetoothWidget.cpp
@@ -31,7 +31,7 @@
 #include "ScreenManager.h"
 #endif
 
-extern const char * TAG;
+extern const char TAG[];
 
 void BluetoothWidget::Init()
 {

diff --git a/examples/all-clusters-minimal-app/esp32/main/Button.cpp b/examples/all-clusters-minimal-app/esp32/main/Button.cpp
@@ -38,7 +38,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <vector>
 
-static const char * TAG = "Button.cpp";
+static const char TAG[] = "Button.cpp";
 
 extern Button gButtons[BUTTON_NUMBER];
 

diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceCallbacks.cpp
@@ -40,7 +40,7 @@
 #include <app-common/zap-generated/ids/Clusters.h>
 #endif
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp b/examples/all-clusters-minimal-app/esp32/main/DeviceWithDisplay.cpp
@@ -27,7 +27,7 @@ using namespace ::chip::Credentials;
 using namespace ::chip::DeviceManager;
 using namespace ::chip::DeviceLayer;
 
-static const char * TAG = "DeviceWithDisplay";
+static const char TAG[] = "DeviceWithDisplay";
 
 #if CONFIG_DEVICE_TYPE_M5STACK
 

diff --git a/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp b/examples/all-clusters-minimal-app/esp32/main/QRCodeScreen.cpp
@@ -43,7 +43,7 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
 // TODO need sensible library tag when put in library
-extern const char * TAG;
+extern const char TAG[];
 
 namespace {
 

diff --git a/examples/all-clusters-minimal-app/esp32/main/WiFiWidget.cpp b/examples/all-clusters-minimal-app/esp32/main/WiFiWidget.cpp
@@ -30,7 +30,7 @@
 #if CONFIG_HAVE_DISPLAY
 #include "ScreenManager.h"
 #endif
-extern const char * TAG;
+extern const char TAG[];
 
 void WiFiWidget::Init()
 {

diff --git a/examples/all-clusters-minimal-app/esp32/main/main.cpp b/examples/all-clusters-minimal-app/esp32/main/main.cpp
@@ -70,7 +70,7 @@ using namespace ::chip::DeviceManager;
 // Used to indicate that an IP address has been added to the QRCode
 #define EXAMPLE_VENDOR_TAG_IP 1
 
-const char * TAG = "all-clusters-minimal-app";
+extern const char TAG[] = "all-clusters-minimal-app";
 
 static AppDeviceCallbacks EchoCallbacks;
 static AppDeviceCallbacksDelegate sAppDeviceCallbacksDelegate;

diff --git a/examples/bridge-app/esp32/main/DeviceCallbacks.cpp b/examples/bridge-app/esp32/main/DeviceCallbacks.cpp
@@ -26,7 +26,7 @@
 
 #include "DeviceCallbacks.h"
 
-static const char * TAG = "bridge-devicecallbacks";
+static const char TAG[] = "bridge-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::app;

diff --git a/examples/bridge-app/esp32/main/main.cpp b/examples/bridge-app/esp32/main/main.cpp
@@ -60,7 +60,7 @@ chip::DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 #endif // CONFIG_ENABLE_ESP32_DEVICE_INFO_PROVIDER
 } // namespace
 
-const char * TAG = "bridge-app";
+extern const char TAG[] = "bridge-app";
 
 using namespace ::chip;
 using namespace ::chip::DeviceManager;

diff --git a/examples/chef/ameba/main/DeviceCallbacks.cpp b/examples/chef/ameba/main/DeviceCallbacks.cpp
@@ -43,7 +43,7 @@
 #include "Globals.h"
 #include "LEDWidget.h"
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/chef/esp32/main/QRCodeScreen.cpp b/examples/chef/esp32/main/QRCodeScreen.cpp
@@ -43,7 +43,7 @@
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 
 // TODO need sensible library tag when put in library
-extern const char * TAG;
+extern const char TAG[];
 
 namespace {
 

diff --git a/examples/chef/esp32/main/main.cpp b/examples/chef/esp32/main/main.cpp
@@ -122,7 +122,7 @@ void DeviceEventCallback(const ChipDeviceEvent * event, intptr_t arg)
  ChipLogProgress(Shell, "Current free heap: %u\n", static_cast<unsigned int>(heap_caps_get_free_size(MALLOC_CAP_8BIT)));
 }
 
-const char * TAG = "chef-app";
+extern const char TAG[] = "chef-app";
 
 #if CONFIG_HAVE_DISPLAY
 void printQRCode()

diff --git a/examples/common/screen-framework/Display.cpp b/examples/common/screen-framework/Display.cpp
@@ -46,7 +46,7 @@
 // The M5Stack's backlight is on Channel 7
 #define BACKLIGHT_CHANNEL LEDC_CHANNEL_7
 
-static const char * TAG = "Display";
+static const char TAG[] = "Display";
 
 uint16_t DisplayHeight = 0;
 uint16_t DisplayWidth = 0;

diff --git a/examples/common/tracing/TraceDecoder.cpp b/examples/common/tracing/TraceDecoder.cpp
@@ -28,7 +28,7 @@
 #include <transport/raw/MessageHeader.h>
 
 constexpr uint16_t kMaxLineLen = 4096;
-constexpr const char * jsonPrefix = " json\t";
+constexpr const char jsonPrefix[] = " json\t";
 
 namespace chip {
 namespace trace {

diff --git a/examples/common/tracing/TraceDecoderArgumentParser.cpp b/examples/common/tracing/TraceDecoderArgumentParser.cpp
@@ -56,7 +56,7 @@ OptionDef sProgramOptionDefs[] = {
  {}
 };
 
-const char * sProgramOptionHelp = " --source <filepath>\n"
+const char sProgramOptionHelp[] = " --source <filepath>\n"
  " The log file to decode.\n"
  // Protocol
  " --disable-protocol-secure-channel\n"

diff --git a/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp b/examples/light-switch-app/ameba/main/DeviceCallbacks.cpp
@@ -44,7 +44,7 @@
 #include "Globals.h"
 #include "LEDWidget.h"
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/light-switch-app/esp32/main/AppTask.cpp b/examples/light-switch-app/esp32/main/AppTask.cpp
@@ -29,7 +29,7 @@
 
 using namespace chip;
 
-static const char * TAG = "app-task";
+static const char TAG[] = "app-task";
 
 Button AppButton;
 

diff --git a/examples/light-switch-app/esp32/main/Button.cpp b/examples/light-switch-app/esp32/main/Button.cpp
@@ -22,7 +22,7 @@
 #define GPIO_INPUT_PIN_SEL (1ULL << GPIO_INPUT_IO_0)
 #define ESP_INTR_FLAG_DEFAULT 0
 
-static const char * TAG = "Button";
+static const char TAG[] = "Button";
 
 static Button::ButtonPressCallback button_press_handler = nullptr;
 

diff --git a/examples/light-switch-app/esp32/main/DeviceCallbacks.cpp b/examples/light-switch-app/esp32/main/DeviceCallbacks.cpp
@@ -26,7 +26,7 @@
 #include "DeviceCallbacks.h"
 #include <lib/support/logging/CHIPLogging.h>
 
-static const char * TAG = "light-switch-app-callbacks";
+static const char TAG[] = "light-switch-app-callbacks";
 
 using namespace chip;
 using namespace chip::Inet;

diff --git a/examples/light-switch-app/esp32/main/main.cpp b/examples/light-switch-app/esp32/main/main.cpp
@@ -69,7 +69,7 @@ DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 #endif // CONFIG_ENABLE_ESP32_DEVICE_INFO_PROVIDER
 } // namespace
 
-static const char * TAG = "light-switch-app";
+static const char TAG[] = "light-switch-app";
 
 static AppDeviceCallbacks EchoCallbacks;
 static AppDeviceCallbacksDelegate sAppDeviceCallbacksDelegate;

diff --git a/examples/lighting-app/ameba/main/DeviceCallbacks.cpp b/examples/lighting-app/ameba/main/DeviceCallbacks.cpp
@@ -43,7 +43,7 @@
 #include <ota/OTAInitializer.h>
 #endif
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/lighting-app/beken/main/DeviceCallbacks.cpp b/examples/lighting-app/beken/main/DeviceCallbacks.cpp
@@ -38,7 +38,7 @@
 #include <support/logging/CHIPLogging.h>
 #include <support/logging/Constants.h>
 
-static const char * TAG = "app-devicecallbacks";
+static const char TAG[] = "app-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/lighting-app/esp32/main/AppTask.cpp b/examples/lighting-app/esp32/main/AppTask.cpp
@@ -35,7 +35,7 @@ using namespace ::chip::app;
 using namespace ::chip::Credentials;
 using namespace ::chip::DeviceLayer;
 
-static const char * TAG = "app-task";
+static const char TAG[] = "app-task";
 
 LEDWidget AppLED;
 

diff --git a/examples/lighting-app/esp32/main/Button.cpp b/examples/lighting-app/esp32/main/Button.cpp
@@ -30,7 +30,7 @@
 #include <platform/CHIPDeviceLayer.h>
 #include <vector>
 
-static const char * TAG = "Button.cpp";
+static const char TAG[] = "Button.cpp";
 
 extern Button gButtons[BUTTON_NUMBER];
 

diff --git a/examples/lighting-app/esp32/main/DeviceCallbacks.cpp b/examples/lighting-app/esp32/main/DeviceCallbacks.cpp
@@ -29,7 +29,7 @@
 #include <app/ConcreteAttributePath.h>
 #include <lib/support/logging/CHIPLogging.h>
 
-static const char * TAG = "light-app-callbacks";
+static const char TAG[] = "light-app-callbacks";
 
 extern LEDWidget AppLED;
 

diff --git a/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp b/examples/lighting-app/esp32/main/DeviceWithDisplay.cpp
@@ -30,7 +30,7 @@ using namespace ::chip::Credentials;
 using namespace ::chip::DeviceManager;
 using namespace ::chip::DeviceLayer;
 
-static const char * TAG = "DeviceWithDisplay";
+static const char TAG[] = "DeviceWithDisplay";
 
 #if CONFIG_DEVICE_TYPE_M5STACK
 

diff --git a/examples/lighting-app/esp32/main/LEDWidget.cpp b/examples/lighting-app/esp32/main/LEDWidget.cpp
@@ -22,7 +22,7 @@
 #endif
 #include "led_strip.h"
 
-static const char * TAG = "LEDWidget";
+static const char TAG[] = "LEDWidget";
 
 void LEDWidget::Init(void)
 {

diff --git a/examples/lighting-app/esp32/main/main.cpp b/examples/lighting-app/esp32/main/main.cpp
@@ -75,7 +75,7 @@ extern const char insights_auth_key_start[] asm("_binary_insights_auth_key_txt_s
 extern const char insights_auth_key_end[] asm("_binary_insights_auth_key_txt_end");
 #endif
 
-static const char * TAG = "light-app";
+static const char TAG[] = "light-app";
 
 static AppDeviceCallbacks EchoCallbacks;
 static AppDeviceCallbacksDelegate sAppDeviceCallbacksDelegate;

diff --git a/examples/lock-app/esp32/main/DeviceCallbacks.cpp b/examples/lock-app/esp32/main/DeviceCallbacks.cpp
@@ -29,7 +29,7 @@
 
 #include <app-common/zap-generated/ids/Clusters.h>
 
-static const char * TAG = "lock-devicecallbacks";
+static const char TAG[] = "lock-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;

diff --git a/examples/lock-app/esp32/main/main.cpp b/examples/lock-app/esp32/main/main.cpp
@@ -68,7 +68,7 @@ DeviceLayer::DeviceInfoProviderImpl gExampleDeviceInfoProvider;
 #endif // CONFIG_ENABLE_ESP32_DEVICE_INFO_PROVIDER
 } // namespace
 
-static const char * TAG = "lock-app";
+static const char TAG[] = "lock-app";
 
 static AppDeviceCallbacks EchoCallbacks;
 

diff --git a/examples/ota-provider-app/esp32/main/DeviceCallbacks.cpp b/examples/ota-provider-app/esp32/main/DeviceCallbacks.cpp
@@ -24,7 +24,7 @@
  **/
 #include "DeviceCallbacks.h"
 
-static const char * TAG = "echo-devicecallbacks";
+static const char TAG[] = "echo-devicecallbacks";
 
 using namespace ::chip;
 using namespace ::chip::Inet;