uncrustify

source/src/cip/cip_security/certificatemanagement.c

@@ -359,11 +359,11 @@ EipStatus CertificateManagementObjectCreateCSR(
 
   if (DEFAULT_DEVICE_CERTIFICATE_INSTANCE_NUMBER == instance->instance_number) { // instance 1
     message_router_response->general_status = kCipErrorObjectStateConflict;
-  }  
+  }
   else{
     const size_t number_of_strings = 8; //number of Create_CSR Request Parameters
     CipShortString short_strings[number_of_strings];
-    memset(short_strings, 0, sizeof(short_strings));
+    memset( short_strings, 0, sizeof(short_strings) );
     // 1: Common Name
     // 2: Organization
     // 3: Organizational Unit
@@ -373,40 +373,47 @@ EipStatus CertificateManagementObjectCreateCSR(
     // 7: Email address
     // 8: Serial number
 
-    for(size_t i = 0; i < number_of_strings; i++){
-      DecodeCipShortString(&short_strings[i],message_router_request, message_router_response);
+    for(size_t i = 0; i < number_of_strings; i++) {
+      DecodeCipShortString(&short_strings[i],
+                           message_router_request,
+                           message_router_response);
     }
 
     // check data
-    if( 2 !=short_strings[5].length && 0 != short_strings[5].length){ // invalid ISO code for country
-        message_router_response->general_status = kCipErrorInvalidParameter;
-        // The CMO state does not change after this service call with invalid parameters
-        return kEipStatusOk;
+    if( 2 !=short_strings[5].length && 0 != short_strings[5].length) { // invalid ISO code for country
+      message_router_response->general_status = kCipErrorInvalidParameter;
+      // The CMO state does not change after this service call with invalid parameters
+      return kEipStatusOk;
     }
 
     // use values from Default Device certificate if items are null
-    for(size_t i = 0; i < number_of_strings; i++){
-        if(0 == short_strings[i].length){
-            //TODO: use value from Default Device certificate
-        }
+    for(size_t i = 0; i < number_of_strings; i++) {
+      if(0 == short_strings[i].length) {
+        //TODO: use value from Default Device certificate
+      }
     }
-    
+
     /* create file object for device certificate */
     CipInstance CSR_file_object = CipFileCreateInstance(""); //no name TODO: check
 
     /* add data to file object */ //TODO: provide CSR file - mbedTLS, use values in short_strings
     CipFileCreateCSRFileInstance(&CSR_file_object);
 
-    CipEpath CSR_file_object_path = CipEpathCreate(2, kCipFileObjectClassCode, CSR_file_object.instance_number, 0);
+    CipEpath CSR_file_object_path = CipEpathCreate(2,
+                                                   kCipFileObjectClassCode,
+                                                   CSR_file_object.instance_number,
+                                                   0);
     /* add path to message*/
-    EncodeCipSecurityObjectPath(&CSR_file_object_path, &message_router_response->message);
+    EncodeCipSecurityObjectPath(&CSR_file_object_path,
+                                &message_router_response->message);
 
     // set CMO state
     CipAttributeStruct *attribute = GetCipAttribute(instance, 2);
-    *(CipUsint *)attribute->data = kCertificateManagementObjectStateValueConfiguring;
+    *(CipUsint *)attribute->data =
+      kCertificateManagementObjectStateValueConfiguring;
 
     // free short string array
-    for(size_t i = 0; i < 8; i++){
+    for(size_t i = 0; i < 8; i++) {
       ClearCipShortString(short_strings + i);
     }
 

source/src/cip/cipconnectionmanager.c

@@ -483,7 +483,7 @@ EipStatus HandleNonNullNonMatchingForwardOpenRequest(
   if(NULL != connection_management_entry) {
     if (NULL != connection_management_entry->open_connection_function) {
       temp = connection_management_entry->open_connection_function(
-          &g_dummy_connection_object, &connection_status);
+        &g_dummy_connection_object, &connection_status);
     } else {
       connection_status = kConnectionManagerExtendedStatusCodeMiscellaneous;
     }

source/src/cip/cipstringi.c

@@ -319,7 +319,7 @@ bool CipStringICompare(const CipStringI *const stringI_1,
 
       /*compare strings*/ //TODO: compare works only for same data types
       if (len_1 == len_2 && string_1_data != NULL && string_2_data != NULL) {
-        if (0 == memcmp(string_1_data, string_2_data, len_1) ) {
+        if ( 0 == memcmp(string_1_data, string_2_data, len_1) ) {
           return true;
         }
       }

source/src/enet_encap/encap.c

@@ -745,7 +745,9 @@ EipStatus HandleReceivedInvalidCommand(
  *                      kInvalidSession .. no free session available
  */
 int GetFreeSessionIndex(void) {
-  for(int session_index = 0; session_index < OPENER_NUMBER_OF_SUPPORTED_SESSIONS; session_index++) {
+  for(int session_index =
+        0; session_index < OPENER_NUMBER_OF_SUPPORTED_SESSIONS;
+      session_index++) {
     if(kEipInvalidSocket == g_registered_sessions[session_index]) {
       return session_index;
     }
@@ -766,7 +768,7 @@ int_fast32_t CreateEncapsulationStructure(const EipUint8 *receive_buffer,
                                           size_t receive_buffer_length,
                                           EncapsulationData *const encapsulation_data)
 {
-  encapsulation_data->communication_buffer_start = (EipUint8*) receive_buffer;
+  encapsulation_data->communication_buffer_start = (EipUint8 *) receive_buffer;
   encapsulation_data->command_code = GetUintFromMessage(&receive_buffer);
   encapsulation_data->data_length = GetUintFromMessage(&receive_buffer);
   encapsulation_data->session_handle = GetUdintFromMessage(&receive_buffer);
@@ -776,7 +778,8 @@ int_fast32_t CreateEncapsulationStructure(const EipUint8 *receive_buffer,
          kSenderContextSize);
   receive_buffer += kSenderContextSize;
   encapsulation_data->options = GetUdintFromMessage(&receive_buffer);
-  encapsulation_data->current_communication_buffer_position = (EipUint8*) receive_buffer;
+  encapsulation_data->current_communication_buffer_position =
+    (EipUint8 *) receive_buffer;
 
   /* Ensure buffer length fits in an int32 before casting in the return expression. */
   OPENER_ASSERT(INT32_MAX >= receive_buffer_length);

source/tests/cip/cipconnectionobjecttest.cpp

@@ -137,8 +137,8 @@ TEST(CipConnectionObject, GetInstanceType) {
   CipConnectionObject connection_object = {0};
   connection_object.instance_type =
     kConnectionObjectInstanceTypeExplicitMessaging;
-  CHECK_EQUAL(kConnectionObjectInstanceTypeExplicitMessaging,
-              ConnectionObjectGetInstanceType(&connection_object) );
+  CHECK_EQUAL( kConnectionObjectInstanceTypeExplicitMessaging,
+               ConnectionObjectGetInstanceType(&connection_object) );
 }
 
 TEST(CipConnectionObject, InstanceTypeIExplicitMessaging) {
@@ -194,46 +194,46 @@ TEST(CipConnectionObject, InstanceTypeCipBridged) {
 TEST(CipConnectionObject, IsTypeNonLOIOConnectionTrue) {
   CipConnectionObject connection_object = {0};
   connection_object.instance_type = kConnectionObjectInstanceTypeIO;
-  CHECK_EQUAL(true,
-              ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
+  CHECK_EQUAL( true,
+               ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
   connection_object.instance_type =
     kConnectionObjectInstanceTypeIOExclusiveOwner;
-  CHECK_EQUAL(true,
-              ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
+  CHECK_EQUAL( true,
+               ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
   connection_object.instance_type = kConnectionObjectInstanceTypeIOInputOnly;
-  CHECK_EQUAL(true,
-              ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
+  CHECK_EQUAL( true,
+               ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
 }
 
 TEST(CipConnectionObject, IsTypeNonLOIOConnectionFalse) {
   CipConnectionObject connection_object = {0};
   connection_object.instance_type = kConnectionObjectInstanceTypeIOListenOnly;
-  CHECK_EQUAL(false,
-              ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
+  CHECK_EQUAL( false,
+               ConnectionObjectIsTypeNonLOIOConnection(&connection_object) );
 }
 
 TEST(CipConnectionObject, IsTypeIOConnectionTrue) {
   CipConnectionObject connection_object = {0};
   connection_object.instance_type = kConnectionObjectInstanceTypeIO;
-  CHECK_EQUAL(true, ConnectionObjectIsTypeIOConnection(&connection_object) );
+  CHECK_EQUAL( true, ConnectionObjectIsTypeIOConnection(&connection_object) );
   connection_object.instance_type =
     kConnectionObjectInstanceTypeIOExclusiveOwner;
-  CHECK_EQUAL(true, ConnectionObjectIsTypeIOConnection(&connection_object) );
+  CHECK_EQUAL( true, ConnectionObjectIsTypeIOConnection(&connection_object) );
   connection_object.instance_type = kConnectionObjectInstanceTypeIOInputOnly;
-  CHECK_EQUAL(true, ConnectionObjectIsTypeIOConnection(&connection_object) );
+  CHECK_EQUAL( true, ConnectionObjectIsTypeIOConnection(&connection_object) );
   connection_object.instance_type = kConnectionObjectInstanceTypeIOListenOnly;
-  CHECK_EQUAL(true, ConnectionObjectIsTypeIOConnection(&connection_object) );
+  CHECK_EQUAL( true, ConnectionObjectIsTypeIOConnection(&connection_object) );
 }
 
 TEST(CipConnectionObject, IsTypeIOConnectionFalse) {
   CipConnectionObject connection_object = {0};
   connection_object.instance_type = kConnectionObjectInstanceTypeInvalid;
-  CHECK_EQUAL(false, ConnectionObjectIsTypeIOConnection(&connection_object) );
+  CHECK_EQUAL( false, ConnectionObjectIsTypeIOConnection(&connection_object) );
   connection_object.instance_type =
     kConnectionObjectInstanceTypeExplicitMessaging;
-  CHECK_EQUAL(false, ConnectionObjectIsTypeIOConnection(&connection_object) );
+  CHECK_EQUAL( false, ConnectionObjectIsTypeIOConnection(&connection_object) );
   connection_object.instance_type = kConnectionObjectInstanceTypeCipBridged;
-  CHECK_EQUAL(false, ConnectionObjectIsTypeIOConnection(&connection_object) );
+  CHECK_EQUAL( false, ConnectionObjectIsTypeIOConnection(&connection_object) );
 }
 
 TEST(CipConnectionObject, TransportClassTriggerDirectionServer) {