Explorar o código

Merge pull request #309 from EIPStackGroup/SonarCloudIssues

Adds const keywords
Martin Melik-Merkumians %!s(int64=5) %!d(string=hai) anos
pai
achega
b3ad6234e7
Modificáronse 2 ficheiros con 16 adicións e 15 borrados
  1. 10 9
      source/src/cip/appcontype.c
  2. 6 6
      source/src/cip/cipassembly.c

+ 10 - 9
source/src/cip/appcontype.c

@@ -188,8 +188,9 @@ CipConnectionObject *GetExclusiveOwnerConnection(
              connection_object->configuration_path.instance_id) ) {
 
       /* check if on other connection point with the same output assembly is currently connected */
-      CipConnectionObject *exclusive_owner = GetConnectedOutputAssembly(
-        connection_object->produced_path.instance_id);
+      const CipConnectionObject *const exclusive_owner =
+        GetConnectedOutputAssembly(
+          connection_object->produced_path.instance_id);
       if ( NULL
            != exclusive_owner ) {
         if(kConnectionObjectStateEstablished ==
@@ -338,7 +339,7 @@ CipConnectionObject *GetListenOnlyConnection(
 CipConnectionObject *GetExistingProducerIoConnection(
   const bool multicast_only,
   const EipUint32 input_point) {
-  DoublyLinkedListNode *node = connection_list.first;
+  const DoublyLinkedListNode *node = connection_list.first;
 
   while (NULL != node) {
     CipConnectionObject *producer_io_connection = node->data;
@@ -368,7 +369,7 @@ CipConnectionObject *GetExistingProducerIoConnection(
 
 CipConnectionObject *GetNextNonControlMasterConnection(
   const EipUint32 input_point) {
-  DoublyLinkedListNode *node = connection_list.first;
+  const DoublyLinkedListNode *node = connection_list.first;
 
   while (NULL != node) {
     CipConnectionObject *next_non_control_master_connection =
@@ -403,9 +404,9 @@ void CloseAllConnectionsForInputWithSameType(const EipUint32 input_point,
 
   OPENER_TRACE_INFO("Close all instance type %d only connections\n",
                     instance_type);
-  DoublyLinkedListNode *node = connection_list.first;
+  const DoublyLinkedListNode *node = connection_list.first;
   while (NULL != node) {
-    CipConnectionObject *connection = node->data;
+    CipConnectionObject *const connection = node->data;
     node = node->next;
     if ( (instance_type == ConnectionObjectGetInstanceType(connection) )
          && (input_point == connection->produced_path.instance_id) ) {
@@ -422,9 +423,9 @@ void CloseAllConnectionsForInputWithSameType(const EipUint32 input_point,
 }
 
 void CloseAllConnections(void) {
-  DoublyLinkedListNode *node = connection_list.first;
+  const DoublyLinkedListNode *node = connection_list.first;
   while (NULL != node) {
-    CipConnectionObject *connection = node->data;
+    CipConnectionObject *const connection = node->data;
     assert(connection->connection_close_function != NULL);
     connection->connection_close_function(connection);
     node = connection_list.first;
@@ -432,7 +433,7 @@ void CloseAllConnections(void) {
 }
 
 bool ConnectionWithSameConfigPointExists(const EipUint32 config_point) {
-  DoublyLinkedListNode *node = connection_list.first;
+  const DoublyLinkedListNode *node = connection_list.first;
 
   while (NULL != node) {
     CipConnectionObject *connection = node->data;

+ 6 - 6
source/src/cip/cipassembly.c

@@ -19,7 +19,7 @@
  *  Currently only supports Attribute 3 (CIP_BYTE_ARRAY) of an Assembly
  */
 EipStatus SetAssemblyAttributeSingle(CipInstance *const instance,
-                                     CipMessageRouterRequest *const message_router_request,
+                                     const CipMessageRouterRequest *const message_router_request,
                                      CipMessageRouterResponse *const message_router_response,
                                      const struct sockaddr *originator_address,
                                      const int encapsulation_session);
@@ -80,10 +80,10 @@ EipStatus CipAssemblyInitialize(void) {
 }
 
 void ShutdownAssemblies(void) {
-  CipClass *assembly_class = GetCipClass(kCipAssemblyClassCode);
+  const CipClass *const assembly_class = GetCipClass(kCipAssemblyClassCode);
 
   if(NULL != assembly_class) {
-    CipInstance *instance = assembly_class->instances;
+    const CipInstance *instance = assembly_class->instances;
     while(NULL != instance) {
       CipAttributeStruct *attribute = GetCipAttribute(instance, 3);
       if(NULL != attribute) {
@@ -139,7 +139,7 @@ EipStatus NotifyAssemblyConnectedDataReceived(CipInstance *const instance,
                                               const EipUint16 data_length) {
   /* empty path (path size = 0) need to be checked and taken care of in future */
   /* copy received data to Attribute 3 */
-  CipByteArray *assembly_byte_array =
+  const CipByteArray *const assembly_byte_array =
     (CipByteArray *) instance->attributes->data;
   if(assembly_byte_array->length != data_length) {
     OPENER_TRACE_ERR("wrong amount of data arrived for assembly object\n");
@@ -154,7 +154,7 @@ EipStatus NotifyAssemblyConnectedDataReceived(CipInstance *const instance,
 }
 
 EipStatus SetAssemblyAttributeSingle(CipInstance *const instance,
-                                     CipMessageRouterRequest *const message_router_request,
+                                     const CipMessageRouterRequest *const message_router_request,
                                      CipMessageRouterResponse *const message_router_response,
                                      const struct sockaddr *originator_address,
                                      const int encapsulation_session) {
@@ -174,7 +174,7 @@ EipStatus SetAssemblyAttributeSingle(CipInstance *const instance,
   if( (attribute != NULL) &&
       (3 == message_router_request->request_path.attribute_number) ) {
     if(attribute->data != NULL) {
-      CipByteArray *data = (CipByteArray *) attribute->data;
+      const CipByteArray *const data = (CipByteArray *) attribute->data;
 
       /* TODO: check for ATTRIBUTE_SET/GETABLE MASK */
       if( true == IsConnectedOutputAssembly(instance->instance_number) ) {