Răsfoiți Sursa

Remove const qualifier from attribute decode function request parameter.

These functions advance the request's data pointer, which means the
request structure cannot be constant. Resolves incompatible pointer
type warnings, e.g., Visual Studio C4090.
Jason Valenzuela 4 ani în urmă
părinte
comite
5a4b0bb089

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

@@ -27,7 +27,7 @@
  *          -1 .. error
  */
 int DecodeCipAssemblyAttribute3(CipByteArray *const data,
-                                const CipMessageRouterRequest *const message_router_request,
+                                CipMessageRouterRequest *const message_router_request,
                                 CipMessageRouterResponse *const message_router_response);
 
 static EipStatus AssemblyPreGetCallback(CipInstance *const instance,
@@ -153,7 +153,7 @@ EipStatus NotifyAssemblyConnectedDataReceived(CipInstance *const instance,
 }
 
 int DecodeCipAssemblyAttribute3(CipByteArray *const data,
-                                const CipMessageRouterRequest *const message_router_request,
+                                CipMessageRouterRequest *const message_router_request,
                                 CipMessageRouterResponse *const message_router_response)
 {
 

+ 1 - 1
source/src/cip/cipethernetlink.c

@@ -571,7 +571,7 @@ static bool IsIfaceControlAllowed(CipUdint instance_id,
 
 int DecodeCipEthernetLinkInterfaceControl(
 		CipEthernetLinkInterfaceControl *const data,
-		const CipMessageRouterRequest *const message_router_request,
+		CipMessageRouterRequest *const message_router_request,
 		CipMessageRouterResponse *const message_router_response) {
 
 	CipInstance *const instance = GetCipInstance(

+ 1 - 1
source/src/cip/cipqos.c

@@ -69,7 +69,7 @@ static CipQosDscpValues s_active_dscp = {
  *          -1 .. error
  */
 int DecodeCipQoSAttribute(CipUsint *const data,
-		const CipMessageRouterRequest *const message_router_request,
+		CipMessageRouterRequest *const message_router_request,
 		CipMessageRouterResponse *const message_router_response) {
 
 	const EipUint8 **const cip_message = message_router_request->data;

+ 4 - 4
source/src/cip/ciptcpipinterface.c

@@ -374,7 +374,7 @@ void EncodeCipLastConflictDetected(const void *const data,
 
 int DecodeTcpIpInterfaceConfigurationControl( /* Attribute 3 */
 		CipDword *const data,
-		const CipMessageRouterRequest *const message_router_request,
+		CipMessageRouterRequest *const message_router_request,
 		CipMessageRouterResponse *const message_router_response) {
 
 	int number_of_decoded_bytes = -1;
@@ -405,7 +405,7 @@ int DecodeTcpIpInterfaceConfigurationControl( /* Attribute 3 */
 
 int DecodeCipTcpIpInterfaceConfiguration( /* Attribute 5 */
 		CipTcpIpInterfaceConfiguration *const data, //kCipUdintUdintUdintUdintUdintString
-		const CipMessageRouterRequest *const message_router_request,
+		CipMessageRouterRequest *const message_router_request,
 		CipMessageRouterResponse *const message_router_response) {
 
 	int number_of_decoded_bytes = -1;
@@ -468,7 +468,7 @@ int DecodeCipTcpIpInterfaceConfiguration( /* Attribute 5 */
 
 int DecodeCipTcpIpInterfaceHostName( /* Attribute 6 */
 		CipString *const data,
-		const CipMessageRouterRequest *const message_router_request,
+		CipMessageRouterRequest *const message_router_request,
 		CipMessageRouterResponse *const message_router_response) {
 
 	int number_of_decoded_bytes = -1;
@@ -511,7 +511,7 @@ int DecodeCipTcpIpInterfaceHostName( /* Attribute 6 */
 
 int DecodeCipTcpIpInterfaceEncapsulationInactivityTimeout( /* Attribute 13 */
 		CipUint *const data,
-		const CipMessageRouterRequest *const message_router_request,
+		CipMessageRouterRequest *const message_router_request,
 		CipMessageRouterResponse *const message_router_response) {
 
 	int number_of_decoded_bytes = -1;

+ 1 - 1
source/src/cip/ciptypes.h

@@ -286,7 +286,7 @@ typedef void (*CipAttributeEncodeInMessage)(const void *const data,
 
 /** @brief self-describing data decoding for CIP types */
 typedef int (*CipAttributeDecodeFromMessage)(const void *const data,
-                                             const CipMessageRouterRequest *
+                                             CipMessageRouterRequest *
                                              const message_router_request,
                                              CipMessageRouterResponse *const
                                              message_router_response);