Fix improperly mutable pointers to string constants

The declaration

  const char * kStringConstant = "value";

declares a mutable pointer to const C string, and so the following
assignment is legal:

  kStringConstant = "other value";

Obviously this is not desired. Declaring as "const char * const" avoids
this, but this declares an unnecessary pointer.

Change these declarations to "const(expr) char []".

These edits were made by the following command:

find . \( -name '*.cpp' -o -name '*.h' \) -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' {} +

examples/air-quality-sensor-app/linux/main.cpp

@@ -35,7 +35,7 @@ using namespace chip::app;
 using namespace chip::app::Clusters;
 
 namespace {
-constexpr const char kChipEventFifoPathPrefix[] = "/tmp/chip_air_quality_fifo_";
+constexpr char kChipEventFifoPathPrefix[] = "/tmp/chip_air_quality_fifo_";
 NamedPipeCommands sChipNamedPipeCommands;
 AirQualitySensorAppAttrUpdateDelegate sAirQualitySensorAppCommandDelegate;
 } // namespace

examples/all-clusters-app/linux/main-common.cpp

@@ -54,7 +54,7 @@ using namespace chip::DeviceLayer;
 
 namespace {
 
-constexpr const char kChipEventFifoPathPrefix[] = "/tmp/chip_all_clusters_fifo_";
+constexpr char kChipEventFifoPathPrefix[] = "/tmp/chip_all_clusters_fifo_";
 LowPowerManager sLowPowerManager;
 NamedPipeCommands sChipNamedPipeCommands;
 AllClustersCommandDelegate sAllClustersCommandDelegate;

examples/chip-tool/commands/clusters/ComplexArgument.h

@@ -46,7 +46,7 @@
 #include "JsonParser.h"
 
 inline constexpr uint8_t kMaxLabelLength = UINT8_MAX;
-inline constexpr const char kNullString[] = "null";
+inline constexpr char kNullString[]  = "null";
 
 class ComplexArgumentParser
 {

examples/chip-tool/commands/clusters/CustomArgument.h

@@ -239,7 +239,7 @@ class CustomArgument
  CHIP_ERROR Parse(const char * label, const char * json)
  {
  Json::Value value;
- constexpr const char kHexNumPrefix[] = "0x";
+ constexpr char kHexNumPrefix[]  = "0x";
  constexpr size_t kHexNumPrefixLen = ArraySize(kHexNumPrefix) - 1;
  if (strncmp(json, kPayloadHexPrefix, kPayloadHexPrefixLen) == 0 ||
  strncmp(json, kPayloadSignedPrefix, kPayloadSignedPrefixLen) == 0 ||

examples/chip-tool/commands/clusters/WriteAttributeCommand.h

@@ -23,9 +23,9 @@
 #include "DataModelLogger.h"
 #include "ModelCommand.h"
 
-inline constexpr const char * kWriteCommandKey = "write";
-inline constexpr const char * kWriteByIdCommandKey = "write-by-id";
-inline constexpr const char * kForceWriteCommandKey = "force-write";
+inline constexpr char kWriteCommandKey[] = "write";
+inline constexpr char kWriteByIdCommandKey[] = "write-by-id";
+inline constexpr char kForceWriteCommandKey[] = "force-write";
 
 enum class WriteCommandType
 {

examples/chip-tool/commands/common/CHIPCommand.cpp

@@ -42,8 +42,8 @@ constexpr chip::FabricId kIdentityAlphaFabricId = 1;
 constexpr chip::FabricId kIdentityBetaFabricId = 2;
 constexpr chip::FabricId kIdentityGammaFabricId = 3;
 constexpr chip::FabricId kIdentityOtherFabricId = 4;
-constexpr const char * kPAATrustStorePathVariable = "CHIPTOOL_PAA_TRUST_STORE_PATH";
-constexpr const char * kCDTrustStorePathVariable = "CHIPTOOL_CD_TRUST_STORE_PATH";
+constexpr char kPAATrustStorePathVariable[]  = "CHIPTOOL_PAA_TRUST_STORE_PATH";
+constexpr char kCDTrustStorePathVariable[]  = "CHIPTOOL_CD_TRUST_STORE_PATH";
 
 const chip::Credentials::AttestationTrustStore * CHIPCommand::sTrustStore = nullptr;
 chip::Credentials::GroupDataProviderImpl CHIPCommand::sGroupDataProvider{ kMaxGroupsPerFabric, kMaxGroupKeysPerFabric };

examples/chip-tool/commands/common/CHIPCommand.h

@@ -34,9 +34,9 @@
 
 #pragma once
 
-inline constexpr const char kIdentityAlpha[] = "alpha";
-inline constexpr const char kIdentityBeta[] = "beta";
-inline constexpr const char kIdentityGamma[] = "gamma";
+inline constexpr char kIdentityAlpha[] = "alpha";
+inline constexpr char kIdentityBeta[] = "beta";
+inline constexpr char kIdentityGamma[] = "gamma";
 // The null fabric commissioner is a commissioner that isn't on a fabric.
 // This is a legal configuration in which the commissioner delegates
 // operational communication and invocation of the commssioning complete
@@ -46,7 +46,7 @@ inline constexpr const char kIdentityGamma[] = "gamma";
 // commissioner portion of such an architecture. The null-fabric-commissioner
 // can carry a commissioning flow up until the point of operational channel
 // (CASE) communcation.
-inline constexpr const char kIdentityNull[] = "null-fabric-commissioner";
+inline constexpr char kIdentityNull[] = "null-fabric-commissioner";
 
 class CHIPCommand : public Command
 {

examples/chip-tool/commands/common/Command.cpp

@@ -38,7 +38,7 @@
 #include <lib/support/StringSplitter.h>
 #include <lib/support/logging/CHIPLogging.h>
 
-constexpr const char * kOptionalArgumentPrefix = "--";
+constexpr char kOptionalArgumentPrefix[]  = "--";
 constexpr size_t kOptionalArgumentPrefixLength = 2;
 
 bool Command::InitArguments(int argc, char ** argv)
@@ -347,7 +347,7 @@ bool Command::InitArgument(size_t argIndex, char * argValue)
  // By default the parameter separator is ";" in order to not collapse with the argument itself if it contains commas
  // (e.g a struct argument with multiple fields). In case one needs to use ";" it can be overriden with the following
  // environment variable.
- constexpr const char * kSeparatorVariable = "CHIPTOOL_CUSTOM_ARGUMENTS_SEPARATOR";
+ constexpr char kSeparatorVariable[]  = "CHIPTOOL_CUSTOM_ARGUMENTS_SEPARATOR";
  char * getenvSeparatorVariableResult = getenv(kSeparatorVariable);
  getline(ss, valueAsString, getenvSeparatorVariableResult ? getenvSeparatorVariableResult[0] : ';');
 

examples/chip-tool/commands/common/Commands.cpp

@@ -37,11 +37,11 @@ namespace {
 
 char kInteractiveModeName[] = "";
 constexpr size_t kInteractiveModeArgumentsMaxLength = 32;
-constexpr const char * kOptionalArgumentPrefix = "--";
-constexpr const char * kJsonClusterKey = "cluster";
-constexpr const char * kJsonCommandKey = "command";
-constexpr const char * kJsonCommandSpecifierKey = "command_specifier";
-constexpr const char * kJsonArgumentsKey = "arguments";
+constexpr char kOptionalArgumentPrefix[]  = "--";
+constexpr char kJsonClusterKey[]  = "cluster";
+constexpr char kJsonCommandKey[]  = "command";
+constexpr char kJsonCommandSpecifierKey[]  = "command_specifier";
+constexpr char kJsonArgumentsKey[]  = "arguments";
 
 #if !CHIP_DISABLE_PLATFORM_KVS
 template <typename T>

examples/chip-tool/commands/common/DeviceScanner.cpp

@@ -23,7 +23,7 @@ using namespace chip::Dnssd;
 
 #if CONFIG_NETWORK_LAYER_BLE
 using namespace chip::Ble;
-constexpr const char * kBleKey = "BLE";
+constexpr char kBleKey[] = "BLE";
 #endif // CONFIG_NETWORK_LAYER_BLE
 
 CHIP_ERROR DeviceScanner::Start()

examples/chip-tool/commands/common/RemoteDataModelLogger.cpp

@@ -21,21 +21,21 @@
 #include <lib/support/SafeInt.h>
 #include <lib/support/jsontlv/TlvJson.h>
 
-constexpr const char * kEventNumberKey = "eventNumber";
-constexpr const char * kDataVersionKey = "dataVersion";
-constexpr const char * kClusterIdKey = "clusterId";
-constexpr const char * kEndpointIdKey = "endpointId";
-constexpr const char * kAttributeIdKey = "attributeId";
-constexpr const char * kEventIdKey = "eventId";
-constexpr const char * kCommandIdKey = "commandId";
-constexpr const char * kErrorIdKey = "error";
-constexpr const char * kClusterErrorIdKey = "clusterError";
-constexpr const char * kValueKey = "value";
-constexpr const char * kNodeIdKey = "nodeId";
-constexpr const char * kNOCKey = "NOC";
-constexpr const char * kICACKey = "ICAC";
-constexpr const char * kRCACKey = "RCAC";
-constexpr const char * kIPKKey = "IPK";
+constexpr char kEventNumberKey[] = "eventNumber";
+constexpr char kDataVersionKey[] = "dataVersion";
+constexpr char kClusterIdKey[] = "clusterId";
+constexpr char kEndpointIdKey[] = "endpointId";
+constexpr char kAttributeIdKey[] = "attributeId";
+constexpr char kEventIdKey[] = "eventId";
+constexpr char kCommandIdKey[] = "commandId";
+constexpr char kErrorIdKey[] = "error";
+constexpr char kClusterErrorIdKey[] = "clusterError";
+constexpr char kValueKey[] = "value";
+constexpr char kNodeIdKey[] = "nodeId";
+constexpr char kNOCKey[] = "NOC";
+constexpr char kICACKey[] = "ICAC";
+constexpr char kRCACKey[] = "RCAC";
+constexpr char kIPKKey[] = "IPK";
 
 namespace {
 RemoteDataModelLoggerDelegate * gDelegate;

examples/chip-tool/commands/interactive/InteractiveCommands.cpp

@@ -22,12 +22,12 @@
 
 #include <editline.h>
 
-constexpr const char * kInteractiveModePrompt = ">>> ";
-constexpr const char * kInteractiveModeHistoryFilePath = "/tmp/chip_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[] = ">>> ";
+constexpr char kInteractiveModeHistoryFilePath[] = "/tmp/chip_tool_history";
+constexpr char kInteractiveModeStopCommand[] = "quit()";
+constexpr char kCategoryError[] = "Error";
+constexpr char kCategoryProgress[] = "Info";
+constexpr char kCategoryDetail[] = "Debug";
 
 namespace {
 

examples/chip-tool/commands/pairing/ToTLVCert.cpp

@@ -21,7 +21,7 @@
 #include <credentials/CHIPCert.h>
 #include <lib/support/Base64.h>
 
-constexpr const char kBase64Header[] = "base64:";
+constexpr char kBase64Header[]  = "base64:";
 constexpr size_t kBase64HeaderLen = ArraySize(kBase64Header) - 1;
 
 CHIP_ERROR ToBase64(const chip::ByteSpan & input, std::string & outputAsPrefixedBase64)

examples/common/tracing/TraceDecoder.cpp

@@ -35,24 +35,24 @@ namespace trace {
 namespace {
 
 // Json keys
-constexpr const char * kProtocolIdKey = "protocol_id";
-constexpr const char * kProtocolCodeKey = "protocol_opcode";
-constexpr const char * kSessionIdKey = "session_id";
-constexpr const char * kExchangeIdKey = "exchange_id";
-constexpr const char * kMessageCounterKey = "msg_counter";
-constexpr const char * kSecurityFlagsKey = "security_flags";
-constexpr const char * kMessageFlagsKey = "msg_flags";
-constexpr const char * kSourceNodeIdKey = "source_node_id";
-constexpr const char * kDestinationNodeIdKey = "dest_node_id";
-constexpr const char * kDestinationGroupIdKey = "group_id";
-constexpr const char * kExchangeFlagsKey = "exchange_flags";
-constexpr const char * kIsInitiatorKey = "is_initiator";
-constexpr const char * kNeedsAckKey = "is_ack_requested";
-constexpr const char * kAckMsgKey = "acknowledged_msg_counter";
-constexpr const char * kPayloadDataKey = "payload_hex";
-constexpr const char * kPayloadSizeKey = "payload_size";
-constexpr const char * kDirectionKey = "direction";
-constexpr const char * kPeerAddress = "peer_address";
+constexpr char kProtocolIdKey[] = "protocol_id";
+constexpr char kProtocolCodeKey[] = "protocol_opcode";
+constexpr char kSessionIdKey[] = "session_id";
+constexpr char kExchangeIdKey[] = "exchange_id";
+constexpr char kMessageCounterKey[] = "msg_counter";
+constexpr char kSecurityFlagsKey[] = "security_flags";
+constexpr char kMessageFlagsKey[] = "msg_flags";
+constexpr char kSourceNodeIdKey[] = "source_node_id";
+constexpr char kDestinationNodeIdKey[] = "dest_node_id";
+constexpr char kDestinationGroupIdKey[] = "group_id";
+constexpr char kExchangeFlagsKey[] = "exchange_flags";
+constexpr char kIsInitiatorKey[] = "is_initiator";
+constexpr char kNeedsAckKey[] = "is_ack_requested";
+constexpr char kAckMsgKey[] = "acknowledged_msg_counter";
+constexpr char kPayloadDataKey[] = "payload_hex";
+constexpr char kPayloadSizeKey[] = "payload_size";
+constexpr char kDirectionKey[] = "direction";
+constexpr char kPeerAddress[] = "peer_address";
 
 bool IsOutbound(const Json::Value & json)
 {

examples/common/tracing/decoder/TraceDecoderProtocols.cpp

@@ -30,7 +30,7 @@
 
 namespace {
 
-constexpr const char * kUnknown = "Unknown";
+constexpr char kUnknown[] = "Unknown";
 
 void ENFORCE_FORMAT(1, 2) TLVPrettyPrinter(const char * aFormat, ...)
 {

examples/common/tracing/decoder/bdx/Decoder.cpp

@@ -21,19 +21,19 @@
 #include <protocols/bdx/BdxMessages.h>
 
 namespace {
-constexpr const char * kProtocolName = "Bulk Data Exchange";
+constexpr char kProtocolName[] = "Bulk Data Exchange";
 
-constexpr const char * kUnknown = "Unknown";
-constexpr const char * kSendInit = "Send Init";
-constexpr const char * kSendAccept = "Send Accept";
-constexpr const char * kReceiveInit = "Receive Init";
-constexpr const char * kReceiveAccept = "Receive Accept";
-constexpr const char * kBlockQuery = "Block Query";
-constexpr const char * kBlock = "Block";
-constexpr const char * kBlockEOF = "Block End Of File";
-constexpr const char * kBlockAck = "Block Ack";
-constexpr const char * kBlockAckEOF = "Block Ack End Of File";
-constexpr const char * kBlockQueryWithSkip = "Block Query With Skip";
+constexpr char kUnknown[] = "Unknown";
+constexpr char kSendInit[] = "Send Init";
+constexpr char kSendAccept[] = "Send Accept";
+constexpr char kReceiveInit[] = "Receive Init";
+constexpr char kReceiveAccept[] = "Receive Accept";
+constexpr char kBlockQuery[] = "Block Query";
+constexpr char kBlock[] = "Block";
+constexpr char kBlockEOF[] = "Block End Of File";
+constexpr char kBlockAck[] = "Block Ack";
+constexpr char kBlockAckEOF[] = "Block Ack End Of File";
+constexpr char kBlockQueryWithSkip[] = "Block Query With Skip";
 } // namespace
 
 using MessageType = chip::bdx::MessageType;

examples/common/tracing/decoder/echo/Decoder.cpp

@@ -21,11 +21,11 @@
 #include <protocols/echo/Echo.h>
 
 namespace {
-constexpr const char * kProtocolName = "Echo";
+constexpr char kProtocolName[] = "Echo";
 
-constexpr const char * kUnknown = "Unknown";
-constexpr const char * kEchoRequest = "Echo Request";
-constexpr const char * kEchoResponse = "Echo Response";
+constexpr char kUnknown[] = "Unknown";
+constexpr char kEchoRequest[] = "Echo Request";
+constexpr char kEchoResponse[] = "Echo Response";
 } // namespace
 
 using MessageType = chip::Protocols::Echo::MsgType;

examples/common/tracing/decoder/interaction_model/Decoder.cpp

@@ -31,19 +31,19 @@
 #include <app/MessageDef/WriteResponseMessage.h>
 
 namespace {
-constexpr const char * kProtocolName = "Interaction Model";
-
-constexpr const char * kUnknown = "Unknown";
-constexpr const char * kStatusResponse = "Status Response";
-constexpr const char * kReadRequest = "Read Request";
-constexpr const char * kSubscribeRequest = "Subscribe Request";
-constexpr const char * kSubscribeResponse = "Subscribe Response";
-constexpr const char * kReportData = "Report Data";
-constexpr const char * kWriteRequest = "Write Request";
-constexpr const char * kWriteResponse = "Write Response";
-constexpr const char * kInvokeCommandRequest = "InvokeCommandRequest";
-constexpr const char * kInvokeCommandResponse = "InvokeCommandResponse";
-constexpr const char * kTimedRequest = "Timed Request";
+constexpr char kProtocolName[] = "Interaction Model";
+
+constexpr char kUnknown[] = "Unknown";
+constexpr char kStatusResponse[] = "Status Response";
+constexpr char kReadRequest[] = "Read Request";
+constexpr char kSubscribeRequest[] = "Subscribe Request";
+constexpr char kSubscribeResponse[] = "Subscribe Response";
+constexpr char kReportData[] = "Report Data";
+constexpr char kWriteRequest[] = "Write Request";
+constexpr char kWriteResponse[] = "Write Response";
+constexpr char kInvokeCommandRequest[] = "InvokeCommandRequest";
+constexpr char kInvokeCommandResponse[] = "InvokeCommandResponse";
+constexpr char kTimedRequest[] = "Timed Request";
 
 } // namespace
 

examples/common/tracing/decoder/logging/ToCertificateString.cpp

@@ -103,16 +103,16 @@ namespace logging {
 
 const char * ToCertificateString(const ByteSpan & source, MutableCharSpan destination)
 {
- constexpr const char * kCertificateHeader = "-----BEGIN CERTIFICATE-----";
- constexpr const char * kCertificateFooter = "-----END CERTIFICATE-----";
+ constexpr char kCertificateHeader[] = "-----BEGIN CERTIFICATE-----";
+ constexpr char kCertificateFooter[] = "-----END CERTIFICATE-----";
 
  return ToCertificate(source, destination, kCertificateHeader, kCertificateFooter);
 }
 
 const char * ToCertificateRequestString(const ByteSpan & source, MutableCharSpan destination)
 {
- constexpr const char * kCertificateHeader = "-----BEGIN CERTIFICATE REQUEST-----";
- constexpr const char * kCertificateFooter = "-----END CERTIFICATE REQUEST-----";
+ constexpr char kCertificateHeader[] = "-----BEGIN CERTIFICATE REQUEST-----";
+ constexpr char kCertificateFooter[] = "-----END CERTIFICATE REQUEST-----";
 
  return ToCertificate(source, destination, kCertificateHeader, kCertificateFooter);
 }

examples/common/tracing/decoder/secure_channel/Decoder.cpp

@@ -24,22 +24,22 @@
 #include <protocols/secure_channel/PASESession.h>
 
 namespace {
-constexpr const char * kProtocolName = "Secure Channel";
-
-constexpr const char * kUnknown = "Unknown";
-constexpr const char * kMsgCounterSyncReq = "Message Counter Sync Request";
-constexpr const char * kMsgCounterSyncResp = "Message Counter Sync Response";
-constexpr const char * kStandaloneAck = "Standalone Ack";
-constexpr const char * kPBKDFParamRequest = "Password-Based Key Derivation Parameters Request";
-constexpr const char * kPBKDFParamResponse = "Password-Based Key Derivation Parameters Response";
-constexpr const char * kPASE_Pake1 = "Password Authenticated Session Establishment '1'";
-constexpr const char * kPASE_Pake2 = "Password Authenticated Session Establishment '2'";
-constexpr const char * kPASE_Pake3 = "Password Authenticated Session Establishment '3'";
-constexpr const char * kCASE_Sigma1 = "Certificate Authenticated Session Establishment Sigma '1'";
-constexpr const char * kCASE_Sigma2 = "Certificate Authenticated Session Establishment Sigma '2'";
-constexpr const char * kCASE_Sigma3 = "Certificate Authenticated Session Establishment Sigma '3'";
-constexpr const char * kCASE_Sigma2Resume = "Certificate Authenticated Session Establishment Sigma '2' Resume";
-constexpr const char * kStatusReport = "Status Report";
+constexpr char kProtocolName[] = "Secure Channel";
+
+constexpr char kUnknown[] = "Unknown";
+constexpr char kMsgCounterSyncReq[] = "Message Counter Sync Request";
+constexpr char kMsgCounterSyncResp[] = "Message Counter Sync Response";
+constexpr char kStandaloneAck[] = "Standalone Ack";
+constexpr char kPBKDFParamRequest[] = "Password-Based Key Derivation Parameters Request";
+constexpr char kPBKDFParamResponse[] = "Password-Based Key Derivation Parameters Response";
+constexpr char kPASE_Pake1[] = "Password Authenticated Session Establishment '1'";
+constexpr char kPASE_Pake2[] = "Password Authenticated Session Establishment '2'";
+constexpr char kPASE_Pake3[] = "Password Authenticated Session Establishment '3'";
+constexpr char kCASE_Sigma1[] = "Certificate Authenticated Session Establishment Sigma '1'";
+constexpr char kCASE_Sigma2[] = "Certificate Authenticated Session Establishment Sigma '2'";
+constexpr char kCASE_Sigma3[] = "Certificate Authenticated Session Establishment Sigma '3'";
+constexpr char kCASE_Sigma2Resume[] = "Certificate Authenticated Session Establishment Sigma '2' Resume";
+constexpr char kStatusReport[] = "Status Report";
 } // namespace
 
 using MessageType = chip::Protocols::SecureChannel::MsgType;

examples/common/tracing/decoder/udc/Decoder.cpp

@@ -21,10 +21,10 @@
 #include <protocols/user_directed_commissioning/UserDirectedCommissioning.h>
 
 namespace {
-constexpr const char * kProtocolName = "User Directed Commissioning";
+constexpr char kProtocolName[] = "User Directed Commissioning";
 
-constexpr const char * kUnknown = "Unknown";
-constexpr const char * kIdentificationDeclaration = "Identification Declaration";
+constexpr char kUnknown[] = "Unknown";
+constexpr char kIdentificationDeclaration[] = "Identification Declaration";
 } // namespace
 
 using MessageType = chip::Protocols::UserDirectedCommissioning::MsgType;