Consts pointer, uncrustify update

Signed-off-by: Martin Melik Merkumians <melik-merkumians@acin.tuwien.ac.at>

source/src/opener_api.h

@@ -31,11 +31,8 @@
  *  specified by the iface string.
  *
  */
-EipStatus IfaceGetConfiguration
-(
-  const char *iface,
-  CipTcpIpInterfaceConfiguration *iface_cfg
-);
+EipStatus IfaceGetConfiguration(const char *iface,
+                                CipTcpIpInterfaceConfiguration *iface_cfg);
 
 /** @ingroup CIP_API
  * @brief Read and return the MAC address of the Ethernet interface
@@ -61,12 +58,9 @@ EipStatus IfaceGetMacAddress(const char *iface,
  * The polling wait process can be aborted by setting @p abort_wait to
  *  a non zero value from another thread.
  */
-EipStatus IfaceWaitForIp
-(
-  const char *iface,
-  int timeout,
-  volatile int *abort_wait
-);
+EipStatus IfaceWaitForIp(const char *const iface,
+                         int timeout,
+                         volatile int *const abort_wait);
 
 /** @ingroup CIP_API
  * @brief Get host name from platform
@@ -172,17 +166,17 @@ typedef void (*InitializeCipClass)(CipClass *); /**< Initializer function for CI
  *  @return pointer to new class object
  *      0 on error
  */
-CipClass *CreateCipClass( const CipUdint class_code,
-                          const int number_of_class_attributes,
-                          const EipUint32 highest_class_attribute_number,
-                          const int number_of_class_services,
-                          const int number_of_instance_attributes,
-                          const EipUint32 highest_instance_attribute_number,
-                          const int number_of_instance_services,
-                          const int number_of_instances,
-                          char *name,
-                          const EipUint16 revision,
-                          InitializeCipClass initializer );
+CipClass *CreateCipClass(const CipUdint class_code,
+                         const int number_of_class_attributes,
+                         const EipUint32 highest_class_attribute_number,
+                         const int number_of_class_services,
+                         const int number_of_instance_attributes,
+                         const EipUint32 highest_instance_attribute_number,
+                         const int number_of_instance_services,
+                         const int number_of_instances,
+                         char *name,
+                         const EipUint16 revision,
+                         InitializeCipClass initializer);
 
 /** @ingroup CIP_API
  * @brief Add a number of CIP instances to a given CIP class
@@ -219,7 +213,6 @@ CipInstance *AddCipInstances(
 CipInstance *AddCipInstance(CipClass *RESTRICT const cip_class_to_add_instance,
                             const EipUint32 instance_id);
 
-
 /** @ingroup CIP_API
  * @brief Insert an attribute in an instance of a CIP class
  *
@@ -241,7 +234,6 @@ void InsertAttribute(CipInstance *const instance,
                      void *const data,
                      const EipByte cip_flags);
 
-
 /** @ingroup CIP_API
  * @brief Allocates Attribute bitmasks
  *
@@ -291,13 +283,9 @@ void InsertService(const CipClass *const cip_class_to_add_service,
  * If either the kPostSetFunc or kNvDataFunc is set the same function
  *  pointer CipClass::PostSetCallback will be called.
  */
-void InsertGetSetCallback
-(
-  CipClass *const cip_class,
-  CipGetSetCallback callback_function,
-  CIPAttributeFlag callbacks_to_install
-);
-
+void InsertGetSetCallback(CipClass *const cip_class,
+                          CipGetSetCallback callback_function,
+                          CIPAttributeFlag callbacks_to_install);
 
 //TODO: Update documentation
 /** @ingroup CIP_API
@@ -310,7 +298,6 @@ void InsertGetSetCallback
  *  @param message_router_response The message router response construct
  */
 
-
 void EncodeCipBool(const CipBool *const data,
                    ENIPMessage *const outgoing_message);
 
@@ -467,10 +454,10 @@ typedef EipStatus (*ConnectionSendDataFunction)(CipConnectionObject *
  *
  * @return Stack status
  */
-typedef CipError (*ConnectionReceiveDataFunction)(
-  CipConnectionObject *connection_object,
-  const EipUint8 *data,
-  const EipUint16 data_length);
+typedef CipError (*ConnectionReceiveDataFunction)(CipConnectionObject *
+                                                  connection_object,
+                                                  const EipUint8 *data,
+                                                  const EipUint16 data_length);
 
 /** @ingroup CIP_API
  * @brief register open functions for an specific object.
@@ -518,11 +505,10 @@ void ConfigureExclusiveOwnerConnectionPoint(
  * @param configuration_assembly_id ID of the configuration point to be used for
  * this connection
  */
-void ConfigureInputOnlyConnectionPoint(
-  const unsigned int connection_number,
-  const unsigned int output_assembly_id,
-  const unsigned int input_assembly_id,
-  const unsigned int configuration_assembly_id);
+void ConfigureInputOnlyConnectionPoint(const unsigned int connection_number,
+                                       const unsigned int output_assembly_id,
+                                       const unsigned int input_assembly_id,
+                                       const unsigned int configuration_assembly_id);
 
 /** \ingroup CIP_API
  * \brief Configures the connection point for a listen only connection.
@@ -537,11 +523,10 @@ void ConfigureInputOnlyConnectionPoint(
  * @param configuration_assembly_id ID of the configuration point to be used for
  * this connection
  */
-void ConfigureListenOnlyConnectionPoint(
-  const unsigned int connection_number,
-  const unsigned int output_assembly_id,
-  const unsigned int input_assembly_id,
-  const unsigned int configuration_assembly_id);
+void ConfigureListenOnlyConnectionPoint(const unsigned int connection_number,
+                                        const unsigned int output_assembly_id,
+                                        const unsigned int input_assembly_id,
+                                        const unsigned int configuration_assembly_id);
 
 /** @ingroup CIP_API
  * @brief Notify the encapsulation layer that an explicit message has been
@@ -557,15 +542,12 @@ void ConfigureListenOnlyConnectionPoint(
  * @param outgoing_message The outgoing ENIP message
  * @return kEipStatusOkSend: a response needs to be sent, others: EIP stack status
  */
-EipStatus HandleReceivedExplictTcpData
-(
-  int socket_handle,
-  EipUint8 *buffer,
-  size_t length,
-  int *number_of_remaining_bytes,
-  struct sockaddr *originator_address,
-  ENIPMessage *const outgoing_message);
-
+EipStatus HandleReceivedExplictTcpData(int socket_handle,
+                                       EipUint8 *buffer,
+                                       size_t length,
+                                       int *number_of_remaining_bytes,
+                                       struct sockaddr *originator_address,
+                                       ENIPMessage *const outgoing_message);
 
 /** @ingroup CIP_API
  * @brief Notify the encapsulation layer that an explicit message has been
@@ -582,16 +564,13 @@ EipStatus HandleReceivedExplictTcpData
  * @param outgoing_message Outgoing ENIP message
  * @return kEipStatusOkSend: a response needs to be sent, others: EIP stack status
  */
-EipStatus HandleReceivedExplictUdpData
-(
-  const int socket_handle,
-  const struct sockaddr_in *from_address,
-  const EipUint8 *buffer,
-  const size_t buffer_length,
-  int *number_of_remaining_bytes,
-  bool unicast,
-  ENIPMessage *const outgoing_message);
-
+EipStatus HandleReceivedExplictUdpData(const int socket_handle,
+                                       const struct sockaddr_in *from_address,
+                                       const EipUint8 *buffer,
+                                       const size_t buffer_length,
+                                       int *number_of_remaining_bytes,
+                                       bool unicast,
+                                       ENIPMessage *const outgoing_message);
 
 /** @ingroup CIP_API
  *  @brief Notify the connection manager that data for a connection has been
@@ -988,29 +967,29 @@ void CloseSocket(const int socket_handle);
  * support different device profiles and specific CIP objects needed for your
  * device. The functions to be used are:
  *   - CipClass *CreateCipClass( const CipUdint class_code,
-                          const int number_of_class_attributes,
-                          const EipUint32 highest_class_attribute_number,
-                          const int number_of_class_services,
-                          const int number_of_instance_attributes,
-                          const EipUint32 highest_instance_attribute_number,
-                          const int number_of_instance_services,
-                          const int number_of_instances,
-                          char *name,
-                          const EipUint16 revision,
-                          InitializeCipClass initializer );
+   const int number_of_class_attributes,
+   const EipUint32 highest_class_attribute_number,
+   const int number_of_class_services,
+   const int number_of_instance_attributes,
+   const EipUint32 highest_instance_attribute_number,
+   const int number_of_instance_services,
+   const int number_of_instances,
+   char *name,
+   const EipUint16 revision,
+   InitializeCipClass initializer );
  *   - CipInstance *AddCipInstances(CipClass *RESTRICT const cip_class,
-                             const int number_of_instances)
+   const int number_of_instances)
  *   - CipInstance *AddCipInstance(CipClass *RESTRICT const class,
-                            const EipUint32 instance_id)
+   const EipUint32 instance_id)
  *   - void InsertAttribute(CipInstance *const cip_instance,
-                     const EipUint16 attribute_number,
-                     const EipUint8 cip_data_type,
-                     void *const cip_data,
-                     const EipByte cip_flags);
+   const EipUint16 attribute_number,
+   const EipUint8 cip_data_type,
+   void *const cip_data,
+   const EipByte cip_flags);
  *   - void InsertService(const CipClass *const cip_class_to_add_service,
-                   const EipUint8 service_code,
-                   const CipServiceFunction service_function,
-                   char *const service_name);
+   const EipUint8 service_code,
+   const CipServiceFunction service_function,
+   char *const service_name);
  *
  * @page license OpENer Open Source License
  * The OpENer Open Source License is an adapted BSD style license. The

source/src/ports/MINGW/networkconfig.c

@@ -399,9 +399,9 @@ EipStatus IfaceGetConfiguration(const char *iface,
 }
 
 /* For Doxygen descriptions see opener_api.h. */
-EipStatus IfaceWaitForIp(const char *iface,
+EipStatus IfaceWaitForIp(const char *const iface,
                          int timeout,
-                         volatile int *abort_wait) {
+                         volatile int *const abort_wait) {
   ULONG iface_idx;
 
   if(kEipStatusOk != DetermineIfaceIndexByString(iface, &iface_idx) ) {

source/src/ports/POSIX/main.c

@@ -63,32 +63,32 @@ int main(int argc,
   cap_value_t capabilities_list[1];
 
   capabilities = cap_get_proc();
-  if (NULL == capabilities) {
+  if(NULL == capabilities) {
     printf("Could not get capabilities\n");
     exit(EXIT_FAILURE);
   }
 
   capabilities_list[0] = CAP_NET_RAW;
-  if (-1
-      == cap_set_flag(capabilities, CAP_EFFECTIVE, 1, capabilities_list,
-                      CAP_SET) ) {
+  if(-1 ==
+     cap_set_flag(capabilities, CAP_EFFECTIVE, 1, capabilities_list,
+                  CAP_SET) ) {
     cap_free(capabilities);
     printf("Could not set CAP_NET_RAW capability\n");
     exit(EXIT_FAILURE);
   }
 
-  if (-1 == cap_set_proc(capabilities) ) {
+  if(-1 == cap_set_proc(capabilities) ) {
     cap_free(capabilities);
     printf("Could not push CAP_NET_RAW capability to process\n");
     exit(EXIT_FAILURE);
   }
 
-  if (-1 == cap_free(capabilities) ) {
+  if(-1 == cap_free(capabilities) ) {
     printf("Could not free capabilities value\n");
     exit(EXIT_FAILURE);
   }
 
-  if (argc != 2) {
+  if(argc != 2) {
     fprintf(stderr, "Wrong number of command line parameters!\n");
     fprintf(stderr, "Usage: %s [interface name]\n", arg[0]);
     fprintf(stderr, "\te.g. ./OpENer eth1\n");
@@ -101,7 +101,7 @@ int main(int argc,
   /* Fetch MAC address from the platform. This tests also if the interface
    *  is present. */
   uint8_t iface_mac[6];
-  if (kEipStatusError == IfaceGetMacAddress(arg[1], iface_mac) ) {
+  if(kEipStatusError == IfaceGetMacAddress(arg[1], iface_mac) ) {
     printf("Network interface %s not found.\n", arg[1]);
     exit(EXIT_FAILURE);
   }
@@ -131,7 +131,7 @@ int main(int argc,
    *  After that any NV data values are loaded to change the attribute contents
    *  to the stored configuration.
    */
-  if (kEipStatusError == NvdataLoad() ) {
+  if(kEipStatusError == NvdataLoad() ) {
     OPENER_TRACE_WARN("Loading of some NV data failed. Maybe the first start?\n");
   }
 
@@ -140,7 +140,7 @@ int main(int argc,
                               g_tcpip.config_control,
                               &g_tcpip.interface_configuration,
                               &g_tcpip.hostname);
-  if (eip_status < 0) {
+  if(eip_status < 0) {
     OPENER_TRACE_ERR("BringUpNetwork() failed\n");
   }
 
@@ -152,10 +152,10 @@ int main(int argc,
   /* Next actions depend on the set network configuration method. */
   CipDword network_config_method = g_tcpip.config_control &
                                    kTcpipCfgCtrlMethodMask;
-  if (kTcpipCfgCtrlStaticIp == network_config_method) {
+  if(kTcpipCfgCtrlStaticIp == network_config_method) {
     OPENER_TRACE_INFO("Static network configuration done\n");
   }
-  if (kTcpipCfgCtrlDhcp == network_config_method) {
+  if(kTcpipCfgCtrlDhcp == network_config_method) {
     OPENER_TRACE_INFO("DHCP network configuration started\n");
     /* DHCP should already have been started with BringupNetwork(). Wait
      * here for IP present (DHCP done) or abort through g_end_stack. */
@@ -164,20 +164,19 @@ int main(int argc,
       "DHCP wait for interface: eip_status %d, g_end_stack=%d\n",
       eip_status,
       g_end_stack);
-    if (kEipStatusOk == eip_status && 0 == g_end_stack) {
+    if(kEipStatusOk == eip_status && 0 == g_end_stack) {
       /* Read IP configuration received via DHCP from interface and store in
        *  the TCP/IP object.*/
       eip_status = IfaceGetConfiguration(arg[1],
                                          &g_tcpip.interface_configuration);
-      if (eip_status < 0) {
+      if(eip_status < 0) {
         OPENER_TRACE_WARN("Problems getting interface configuration\n");
       }
     }
   }
 
-
   /* The network initialization of the EIP stack for the NetworkHandler. */
-  if (!g_end_stack && kEipStatusOk == NetworkHandlerInitialize() ) {
+  if(!g_end_stack && kEipStatusOk == NetworkHandlerInitialize() ) {
 #ifdef OPENER_RT
     int ret;
 
@@ -259,10 +258,9 @@ int main(int argc,
 }
 
 static void LeaveStack(int signal) {
-  if (SIGHUP == signal || SIGINT == signal) {
+  if(SIGHUP == signal || SIGINT == signal) {
     g_end_stack = signal;
-  }
-  OPENER_TRACE_STATE("got signal %d\n", signal);
+  } OPENER_TRACE_STATE("got signal %d\n", signal);
 }
 
 static void *executeEventLoop(void *pthread_arg) {
@@ -270,8 +268,8 @@ static void *executeEventLoop(void *pthread_arg) {
   (void) pthread_arg;
 
   /* The event loop. Put other processing you need done continually in here */
-  while (!g_end_stack) {
-    if (kEipStatusOk != NetworkHandlerProcessOnce() ) {
+  while(!g_end_stack) {
+    if(kEipStatusOk != NetworkHandlerProcessOnce() ) {
       OPENER_TRACE_ERR("Error in NetworkHandler loop! Exiting OpENer!\n");
       break;
     }

source/src/ports/POSIX/networkconfig.c

@@ -277,7 +277,7 @@ EipStatus IfaceGetConfiguration(const char *iface,
 
 /* For an API documentation look at opener_api.h. */
 #define WAIT_CYCLE_NS   100000000U
-EipStatus IfaceWaitForIp(const char *iface,
+EipStatus IfaceWaitForIp(const char *const iface,
                          int timeout,
                          volatile int *const p_abort_wait) {
   struct ifreq ifr;

source/src/ports/WIN32/networkconfig.c

@@ -399,9 +399,9 @@ EipStatus IfaceGetConfiguration(const char *iface,
 }
 
 /* For Doxygen descriptions see opener_api.h. */
-EipStatus IfaceWaitForIp(const char *iface,
+EipStatus IfaceWaitForIp(const char *const iface,
                          int timeout,
-                         volatile int *abort_wait) {
+                         volatile int *const abort_wait) {
   ULONG iface_idx;
 
   if(kEipStatusOk != DetermineIfaceIndexByString(iface, &iface_idx) ) {