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' {} +
mspang · Dec 5, 2023 · aba4909 · aba4909
1 parent b6c264a
commit aba4909
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm b/examples/darwin-framework-tool/commands/common/CHIPCommandBridge.mm
@@ -31,7 +31,7 @@
 std::map<std::string, MTRDeviceController *> 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
@@ -27,15 +27,15 @@
 
 #include <string>
 
-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
@@ -23,12 +23,12 @@
 
 #include <editline.h>
 
-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
@@ -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
@@ -25,8 +25,8 @@
 #include <platform/LockTracker.h>
 
 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
@@ -44,7 +44,7 @@
 constexpr uint64_t kScanningWithoutDelegateTimeoutInSeconds = 120;
 constexpr uint64_t kCachePeripheralTimeoutInSeconds
  = static_cast<uint64_t>(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,