From aba4909de12c691b1956f0cca069d2aa28be97c2 Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Mon, 4 Dec 2023 18:44:33 -0500 Subject: [PATCH] Also fix objc++ 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' -o -name '*.mm' \) -exec sed -i 's,^\( *\)\(static \|extern \|\)\(inline \|\)\(constexpr \|\)const char *\* * k\([A-Z][^][ ;()]*\)\( \|;\),\1\2\3\4const char k\5[]\6,g; s,^\([^()]*\)constexpr const char k\([^()]*\)\( \|;\),\1constexpr char k\2\3,g; s,^\( *\)const\(expr\|\) char \([^()]*\)\[\] *= ",\1static const\2 char \3[] = ",g' {} + --- .../commands/common/CHIPCommandBridge.mm | 2 +- .../commands/common/RemoteDataModelLogger.mm | 18 +++++++++--------- .../interactive/InteractiveCommands.mm | 12 ++++++------ .../Framework/CHIP/MTRCommissionableBrowser.mm | 2 +- .../Framework/CHIP/MTROperationalBrowser.mm | 4 ++-- .../Darwin/BleConnectionDelegateImpl.mm | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm index ef99e4fd0deac7..205b56d6a64e3d 100644 --- a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm +++ b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm @@ -31,7 +31,7 @@ std::map CHIPCommandBridge::mControllers; dispatch_queue_t CHIPCommandBridge::mOTAProviderCallbackQueue; OTAProviderDelegate * CHIPCommandBridge::mOTADelegate; -constexpr const char * kTrustStorePathVariable = "PAA_TRUST_STORE_PATH"; +constexpr char kTrustStorePathVariable[] = "PAA_TRUST_STORE_PATH"; CHIPToolKeypair * gNocSigner = [[CHIPToolKeypair alloc] init]; diff --git a/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.mm b/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.mm index 679dca5bd3be83..196af6048356a4 100644 --- a/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.mm +++ b/examples/darwin-framework-tool/commands/common/RemoteDataModelLogger.mm @@ -27,15 +27,15 @@ #include -constexpr const char * kClusterIdKey = "clusterId"; -constexpr const char * kEndpointIdKey = "endpointId"; -constexpr const char * kAttributeIdKey = "attributeId"; -constexpr const char * kCommandIdKey = "commandId"; -constexpr const char * kErrorIdKey = "error"; -constexpr const char * kClusterErrorIdKey = "clusterError"; -constexpr const char * kValueKey = "value"; - -constexpr const char kBase64Header[] = "base64:"; +constexpr char kClusterIdKey[] = "clusterId"; +constexpr char kEndpointIdKey[] = "endpointId"; +constexpr char kAttributeIdKey[] = "attributeId"; +constexpr char kCommandIdKey[] = "commandId"; +constexpr char kErrorIdKey[] = "error"; +constexpr char kClusterErrorIdKey[] = "clusterError"; +constexpr char kValueKey[] = "value"; + +constexpr char kBase64Header[] = "base64:"; namespace { RemoteDataModelLoggerDelegate * gDelegate; diff --git a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm index 3242b5fa2c9022..ec0b48b6903fc1 100644 --- a/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm +++ b/examples/darwin-framework-tool/commands/interactive/InteractiveCommands.mm @@ -23,12 +23,12 @@ #include -constexpr const char * kInteractiveModePrompt = "Stop and restart stack: [Ctrl+_] & [Ctrl+^] \nQuit Interactive: 'quit()'\n>>> "; -constexpr const char * kInteractiveModeHistoryFilePath = "/tmp/darwin_framework_tool_history"; -constexpr const char * kInteractiveModeStopCommand = "quit()"; -constexpr const char * kCategoryError = "Error"; -constexpr const char * kCategoryProgress = "Info"; -constexpr const char * kCategoryDetail = "Debug"; +constexpr char kInteractiveModePrompt[] = "Stop and restart stack: [Ctrl+_] & [Ctrl+^] \nQuit Interactive: 'quit()'\n>>> "; +constexpr char kInteractiveModeHistoryFilePath[] = "/tmp/darwin_framework_tool_history"; +constexpr char kInteractiveModeStopCommand[] = "quit()"; +constexpr char kCategoryError[] = "Error"; +constexpr char kCategoryProgress[] = "Info"; +constexpr char kCategoryDetail[] = "Debug"; namespace { diff --git a/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm b/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm index c6fd8d8fe6d559..4e7b253fff5831 100644 --- a/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm +++ b/src/darwin/Framework/CHIP/MTRCommissionableBrowser.mm @@ -33,7 +33,7 @@ using namespace chip::Ble; #endif // CONFIG_NETWORK_LAYER_BLE -constexpr const char * kBleKey = "BLE"; +constexpr char kBleKey[] = "BLE"; @implementation MTRCommissionableBrowserResultInterfaces @end diff --git a/src/darwin/Framework/CHIP/MTROperationalBrowser.mm b/src/darwin/Framework/CHIP/MTROperationalBrowser.mm index b547b35b842aa7..689bab9376fd01 100644 --- a/src/darwin/Framework/CHIP/MTROperationalBrowser.mm +++ b/src/darwin/Framework/CHIP/MTROperationalBrowser.mm @@ -25,8 +25,8 @@ #include namespace { -constexpr const char kLocalDot[] = "local."; -constexpr const char kOperationalType[] = "_matter._tcp"; +constexpr char kLocalDot[] = "local."; +constexpr char kOperationalType[] = "_matter._tcp"; constexpr DNSServiceFlags kBrowseFlags = 0; } diff --git a/src/platform/Darwin/BleConnectionDelegateImpl.mm b/src/platform/Darwin/BleConnectionDelegateImpl.mm index 6045c87bdff3d4..5677c014cc0a2f 100644 --- a/src/platform/Darwin/BleConnectionDelegateImpl.mm +++ b/src/platform/Darwin/BleConnectionDelegateImpl.mm @@ -44,7 +44,7 @@ constexpr uint64_t kScanningWithoutDelegateTimeoutInSeconds = 120; constexpr uint64_t kCachePeripheralTimeoutInSeconds = static_cast(CHIP_DEVICE_CONFIG_BLE_SLOW_ADVERTISING_INTERVAL_MAX / 1000.0 * 8.0 * 0.625); -constexpr const char * kBleWorkQueueName = "org.csa-iot.matter.framework.ble.workqueue"; +constexpr char kBleWorkQueueName[] = "org.csa-iot.matter.framework.ble.workqueue"; typedef NS_ENUM(uint8_t, BleConnectionMode) { kUndefined = 0,