Skip to content

Remove redundant conditions #419

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: v1.5
Choose a base branch
from
Open

Remove redundant conditions #419

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 9 additions & 36 deletions src/iec61850/server/mms_mapping/control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,7 @@ static MmsValue*
getOperParameterCtlNum(MmsValue* operParameters)
{
if (MmsValue_getType(operParameters) == MMS_STRUCTURE) {
if (MmsValue_getArraySize(operParameters) == 7)
return MmsValue_getElement(operParameters, 3);
else if (MmsValue_getArraySize(operParameters) == 6)
return MmsValue_getElement(operParameters, 2);
return MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 4);
}

return NULL;
Expand All @@ -88,10 +85,7 @@ static MmsValue*
getCancelParameterCtlNum(MmsValue* operParameters)
{
if (MmsValue_getType(operParameters) == MMS_STRUCTURE) {
if (MmsValue_getArraySize(operParameters) == 6)
return MmsValue_getElement(operParameters, 3);
else if (MmsValue_getArraySize(operParameters) == 5)
return MmsValue_getElement(operParameters, 2);
return MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 3);
}

return NULL;
Expand All @@ -101,10 +95,7 @@ static MmsValue*
getCancelParameterOrigin(MmsValue* operParameters)
{
if (MmsValue_getType(operParameters) == MMS_STRUCTURE) {
if (MmsValue_getArraySize(operParameters) == 6)
return MmsValue_getElement(operParameters, 2);
else if (MmsValue_getArraySize(operParameters) == 5)
return MmsValue_getElement(operParameters, 1);
return MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 4);
}

return NULL;
Expand All @@ -115,10 +106,7 @@ getOperParameterTest(MmsValue* operParameters)
{
if (MmsValue_getType(operParameters) == MMS_STRUCTURE)
{
if (MmsValue_getArraySize(operParameters) == 7)
return MmsValue_getElement(operParameters, 5);
else if (MmsValue_getArraySize(operParameters) == 6)
return MmsValue_getElement(operParameters, 4);
return MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 2);
}

return NULL;
Expand All @@ -129,10 +117,7 @@ getOperParameterCheck(MmsValue* operParameters)
{
if (MmsValue_getType(operParameters) == MMS_STRUCTURE)
{
if (MmsValue_getArraySize(operParameters) == 7)
return MmsValue_getElement(operParameters, 6);
else if (MmsValue_getArraySize(operParameters) == 6)
return MmsValue_getElement(operParameters, 5);
return MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 1);
}

return NULL;
Expand All @@ -143,10 +128,7 @@ getOperParameterOrigin(MmsValue* operParameters)
{
if (MmsValue_getType(operParameters) == MMS_STRUCTURE)
{
if (MmsValue_getArraySize(operParameters) == 7)
return MmsValue_getElement(operParameters, 2);
else if (MmsValue_getArraySize(operParameters) == 6)
return MmsValue_getElement(operParameters, 1);
return MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 5);
}

return NULL;
Expand All @@ -157,10 +139,7 @@ getCancelParameterTest(MmsValue* operParameters)
{
if (MmsValue_getType(operParameters) == MMS_STRUCTURE)
{
if (MmsValue_getArraySize(operParameters) == 6)
return MmsValue_getElement(operParameters, 5);
else if (MmsValue_getArraySize(operParameters) == 5)
return MmsValue_getElement(operParameters, 4);
return MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 1);
}

return NULL;
Expand All @@ -173,10 +152,7 @@ getOperParameterTime(MmsValue* operParameters)

if (MmsValue_getType(operParameters) == MMS_STRUCTURE)
{
if (MmsValue_getArraySize(operParameters) == 7)
timeParameter = MmsValue_getElement(operParameters, 4);
else if (MmsValue_getArraySize(operParameters) == 6)
timeParameter = MmsValue_getElement(operParameters, 3);
timeParameter = MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 3);
}

if (timeParameter != NULL)
Expand All @@ -193,10 +169,7 @@ getCancelParameterTime(MmsValue* operParameters)

if (MmsValue_getType(operParameters) == MMS_STRUCTURE)
{
if (MmsValue_getArraySize(operParameters) == 6)
timeParameter = MmsValue_getElement(operParameters, 4);
else if (MmsValue_getArraySize(operParameters) == 5)
timeParameter = MmsValue_getElement(operParameters, 3);
timeParameter = MmsValue_getElement(operParameters, MmsValue_getArraySize(operParameters) - 2);
}

if (timeParameter != NULL)
Expand Down