From 2d787755ecfd7e158e8a2331481eb515b1c50112 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Thu, 4 Jul 2024 18:12:07 +0100 Subject: [PATCH] - small code change to make code compile with VS2022 --- src/iec61850/server/mms_mapping/mms_mapping.c | 39 +------------------ 1 file changed, 1 insertion(+), 38 deletions(-) diff --git a/src/iec61850/server/mms_mapping/mms_mapping.c b/src/iec61850/server/mms_mapping/mms_mapping.c index a14ed58f..1435df2d 100644 --- a/src/iec61850/server/mms_mapping/mms_mapping.c +++ b/src/iec61850/server/mms_mapping/mms_mapping.c @@ -2499,43 +2499,6 @@ writeAccessGooseControlBlock(MmsMapping* self, MmsDomain* domain, const char* va #endif /* (CONFIG_INCLUDE_GOOSE_SUPPORT == 1) */ -#if 0 -static MmsValue* -checkIfValueBelongsToModelNode(DataAttribute* dataAttribute, MmsValue* value, MmsValue* newValue) -{ - if (dataAttribute->mmsValue == value) - return newValue; - - DataAttribute* child = (DataAttribute*) dataAttribute->firstChild; - - while (child != NULL) { - MmsValue* tmpValue = checkIfValueBelongsToModelNode(child, value, newValue); - - if (tmpValue != NULL) - return tmpValue; - else - child = (DataAttribute*) child->sibling; - } - - if (MmsValue_getType(value) == MMS_STRUCTURE) { - int elementCount = MmsValue_getArraySize(value); - - int i; - for (i = 0; i < elementCount; i++) { - MmsValue* childValue = MmsValue_getElement(value, i); - MmsValue* childNewValue = MmsValue_getElement(newValue, i); - - MmsValue* tmpValue = checkIfValueBelongsToModelNode(dataAttribute, childValue, childNewValue); - - if (tmpValue != NULL) - return tmpValue; - } - } - - return NULL; -} -#endif - static FunctionalConstraint getFunctionalConstraintForWritableNode(char* separator) { @@ -2626,7 +2589,7 @@ mmsWriteHandler(void* parameter, MmsDomain* domain, /* Access control based on functional constraint */ - char* separator = strchr(variableId, '$'); + char* separator = (char*)strchr(variableId, '$'); if (separator == NULL) return DATA_ACCESS_ERROR_INVALID_ADDRESS;