Răsfoiți Sursa

Add restrict qualifier to close connection functions.

This makes all functions used as ConnectionCloseFunction pointer targets
have the same prototype, resolving Visual Studio C4028 warnings.
Jason Valenzuela 5 ani în urmă
părinte
comite
b3f391720f
2 a modificat fișierele cu 4 adăugiri și 3 ștergeri
  1. 2 2
      source/src/cip/cipioconnection.c
  2. 2 1
      source/src/opener_api.h

+ 2 - 2
source/src/cip/cipioconnection.c

@@ -45,7 +45,7 @@ EipUint16 HandleConfigData(CipConnectionObject *connection_object);
 /* Regularly close the IO connection. If it is an exclusive owner or input only
  * connection and in charge of the connection a new owner will be searched
  */
-void CloseIoConnection(CipConnectionObject *connection_object);
+void CloseIoConnection(CipConnectionObject *RESTRICT connection_object);
 
 void HandleIoConnectionTimeOut(CipConnectionObject *connection_object);
 
@@ -726,7 +726,7 @@ static int transfer_master_connection(CipConnectionObject *connection_object) {
 }
 
 /* Always sync any changes with HandleIoConnectionTimeout() */
-void CloseIoConnection(CipConnectionObject *connection_object) {
+void CloseIoConnection(CipConnectionObject *RESTRICT connection_object) {
   ConnectionObjectInstanceType instance_type = ConnectionObjectGetInstanceType(connection_object);
   ConnectionObjectConnectionType conn_type = ConnectionObjectGetTToOConnectionType(connection_object);
 

+ 2 - 1
source/src/opener_api.h

@@ -583,7 +583,8 @@ typedef CipError (*OpenConnectionFunction)(
  * @param connection_object The connection object which is closing the
  * connection
  */
-typedef void (*ConnectionCloseFunction)(CipConnectionObject *connection_object);
+typedef void (*ConnectionCloseFunction)(CipConnectionObject *RESTRICT
+                                        connection_object);
 
 /** @ingroup CIP_API
  * @brief Function prototype for handling the timeout of connections