- code format updates

v1.6
Michael Zillgith 4 weeks ago
parent a41d2dce37
commit 4481530afb

@ -34,7 +34,7 @@ iedModel_emptyVariableInitializer(void)
void void
IedModel_setIedNameForDynamicModel(IedModel* self, const char* name) IedModel_setIedNameForDynamicModel(IedModel* self, const char* name)
{ {
if (self->name != NULL) if (self->name)
GLOBAL_FREEMEM(self->name); GLOBAL_FREEMEM(self->name);
self->name = StringUtils_copyString(name); self->name = StringUtils_copyString(name);
@ -74,14 +74,17 @@ static void
IedModel_addDataSet(IedModel* self, DataSet* dataSet) IedModel_addDataSet(IedModel* self, DataSet* dataSet)
{ {
if (self->dataSets == NULL) if (self->dataSets == NULL)
{
self->dataSets = dataSet; self->dataSets = dataSet;
}
else else
{ {
DataSet* lastDataSet = self->dataSets; DataSet* lastDataSet = self->dataSets;
while (lastDataSet != NULL) while (lastDataSet)
{
if (lastDataSet->sibling == NULL)
{ {
if (lastDataSet->sibling == NULL) {
lastDataSet->sibling = dataSet; lastDataSet->sibling = dataSet;
break; break;
} }
@ -95,12 +98,14 @@ static void
IedModel_addLogicalDevice(IedModel* self, LogicalDevice* lDevice) IedModel_addLogicalDevice(IedModel* self, LogicalDevice* lDevice)
{ {
if (self->firstChild == NULL) if (self->firstChild == NULL)
{
self->firstChild = lDevice; self->firstChild = lDevice;
}
else else
{ {
LogicalDevice* sibling = self->firstChild; LogicalDevice* sibling = self->firstChild;
while (sibling->sibling != NULL) while (sibling->sibling)
sibling = (LogicalDevice*)sibling->sibling; sibling = (LogicalDevice*)sibling->sibling;
sibling->sibling = (ModelNode*)lDevice; sibling->sibling = (ModelNode*)lDevice;
@ -111,12 +116,14 @@ static void
IedModel_addLog(IedModel* self, Log* log) IedModel_addLog(IedModel* self, Log* log)
{ {
if (self->logs == NULL) if (self->logs == NULL)
{
self->logs = log; self->logs = log;
}
else else
{ {
Log* lastLog = self->logs; Log* lastLog = self->logs;
while (lastLog->sibling != NULL) while (lastLog->sibling)
lastLog = lastLog->sibling; lastLog = lastLog->sibling;
lastLog->sibling = log; lastLog->sibling = log;
@ -127,12 +134,14 @@ static void
IedModel_addLogControlBlock(IedModel* self, LogControlBlock* lcb) IedModel_addLogControlBlock(IedModel* self, LogControlBlock* lcb)
{ {
if (self->lcbs == NULL) if (self->lcbs == NULL)
{
self->lcbs = lcb; self->lcbs = lcb;
}
else else
{ {
LogControlBlock* lastLcb = self->lcbs; LogControlBlock* lastLcb = self->lcbs;
while (lastLcb->sibling != NULL) while (lastLcb->sibling)
lastLcb = lastLcb->sibling; lastLcb = lastLcb->sibling;
lastLcb->sibling = lcb; lastLcb->sibling = lcb;
@ -143,12 +152,14 @@ static void
IedModel_addReportControlBlock(IedModel* self, ReportControlBlock* rcb) IedModel_addReportControlBlock(IedModel* self, ReportControlBlock* rcb)
{ {
if (self->rcbs == NULL) if (self->rcbs == NULL)
{
self->rcbs = rcb; self->rcbs = rcb;
}
else else
{ {
ReportControlBlock* lastRcb = self->rcbs; ReportControlBlock* lastRcb = self->rcbs;
while (lastRcb->sibling != NULL) while (lastRcb->sibling)
lastRcb = lastRcb->sibling; lastRcb = lastRcb->sibling;
lastRcb->sibling = rcb; lastRcb->sibling = rcb;
@ -160,12 +171,14 @@ static void
IedModel_addSettingGroupControlBlock(IedModel* self, SettingGroupControlBlock* sgcb) IedModel_addSettingGroupControlBlock(IedModel* self, SettingGroupControlBlock* sgcb)
{ {
if (self->sgcbs == NULL) if (self->sgcbs == NULL)
{
self->sgcbs = sgcb; self->sgcbs = sgcb;
}
else else
{ {
SettingGroupControlBlock* lastSgcb = self->sgcbs; SettingGroupControlBlock* lastSgcb = self->sgcbs;
while (lastSgcb->sibling != NULL) while (lastSgcb->sibling)
lastSgcb = lastSgcb->sibling; lastSgcb = lastSgcb->sibling;
lastSgcb->sibling = sgcb; lastSgcb->sibling = sgcb;
@ -177,7 +190,9 @@ static void
IedModel_addGSEControlBlock(IedModel* self, GSEControlBlock* gcb) IedModel_addGSEControlBlock(IedModel* self, GSEControlBlock* gcb)
{ {
if (self->gseCBs == NULL) if (self->gseCBs == NULL)
{
self->gseCBs = gcb; self->gseCBs = gcb;
}
else else
{ {
GSEControlBlock* lastGcb = self->gseCBs; GSEControlBlock* lastGcb = self->gseCBs;
@ -192,7 +207,8 @@ IedModel_addGSEControlBlock(IedModel* self, GSEControlBlock* gcb)
static void static void
IedModel_addSMVControlBlock(IedModel* self, SVControlBlock* smvcb) IedModel_addSMVControlBlock(IedModel* self, SVControlBlock* smvcb)
{ {
if (self->svCBs == NULL) { if (self->svCBs == NULL)
{
self->svCBs = smvcb; self->svCBs = smvcb;
} }
else else
@ -242,7 +258,8 @@ LogicalDevice_getLastLogicalNode(LogicalDevice* self)
LogicalNode* nextNode = lastNode; LogicalNode* nextNode = lastNode;
while (nextNode != NULL) { while (nextNode)
{
lastNode = nextNode; lastNode = nextNode;
nextNode = (LogicalNode*)nextNode->sibling; nextNode = (LogicalNode*)nextNode->sibling;
} }
@ -254,8 +271,11 @@ static void
LogicalDevice_addLogicalNode(LogicalDevice* self, LogicalNode* lNode) LogicalDevice_addLogicalNode(LogicalDevice* self, LogicalNode* lNode)
{ {
if (self->firstChild == NULL) if (self->firstChild == NULL)
{
self->firstChild = (ModelNode*)lNode; self->firstChild = (ModelNode*)lNode;
else { }
else
{
LogicalNode* lastNode = LogicalDevice_getLastLogicalNode(self); LogicalNode* lastNode = LogicalDevice_getLastLogicalNode(self);
lastNode->sibling = (ModelNode*)lNode; lastNode->sibling = (ModelNode*)lNode;
@ -288,7 +308,8 @@ LogicalNode_getLastDataObject(LogicalNode* self)
DataObject* nextNode = lastNode; DataObject* nextNode = lastNode;
while (nextNode != NULL) { while (nextNode)
{
lastNode = nextNode; lastNode = nextNode;
nextNode = (DataObject*) nextNode->sibling; nextNode = (DataObject*) nextNode->sibling;
} }
@ -301,8 +322,11 @@ static void
LogicalNode_addDataObject(LogicalNode* self, DataObject* dataObject) LogicalNode_addDataObject(LogicalNode* self, DataObject* dataObject)
{ {
if (self->firstChild == NULL) if (self->firstChild == NULL)
{
self->firstChild = (ModelNode*)dataObject; self->firstChild = (ModelNode*)dataObject;
else { }
else
{
DataObject* lastDataObject = LogicalNode_getLastDataObject(self); DataObject* lastDataObject = LogicalNode_getLastDataObject(self);
lastDataObject->sibling = (ModelNode*)dataObject; lastDataObject->sibling = (ModelNode*)dataObject;
@ -435,15 +459,18 @@ ReportControlBlock_create(const char* name, LogicalNode* parent, const char* rpt
void void
ReportControlBlock_setPreconfiguredClient(ReportControlBlock* self, uint8_t clientType, const uint8_t* clientAddress) ReportControlBlock_setPreconfiguredClient(ReportControlBlock* self, uint8_t clientType, const uint8_t* clientAddress)
{ {
if (clientType == 4) { /* IPv4 address */ if (clientType == 4) /* IPv4 address */
{
self->clientReservation[0] = 4; self->clientReservation[0] = 4;
memcpy(self->clientReservation + 1, clientAddress, 4); memcpy(self->clientReservation + 1, clientAddress, 4);
} }
else if (clientType == 6) { /* IPv6 address */ else if (clientType == 6) /* IPv6 address */
{
self->clientReservation[0] = 6; self->clientReservation[0] = 6;
memcpy(self->clientReservation + 1, clientAddress, 6); memcpy(self->clientReservation + 1, clientAddress, 6);
} }
else { /* no reservation or unknown type */ else /* no reservation or unknown type */
{
self->clientReservation[0] = 0; self->clientReservation[0] = 0;
} }
} }
@ -536,7 +563,7 @@ GSEControlBlock_create(const char* name, LogicalNode* parent, const char* appId,
self->sibling = NULL; self->sibling = NULL;
if (parent != NULL) if (parent)
LogicalNode_addGSEControlBlock(parent, self); LogicalNode_addGSEControlBlock(parent, self);
} }
@ -630,7 +657,8 @@ DataObject_getLastChild(DataObject* self)
ModelNode* nextNode = lastNode; ModelNode* nextNode = lastNode;
while (nextNode != NULL) { while (nextNode)
{
lastNode = nextNode; lastNode = nextNode;
nextNode = (ModelNode*)nextNode->sibling; nextNode = (ModelNode*)nextNode->sibling;
} }
@ -642,8 +670,11 @@ static void
DataObject_addChild(DataObject* self, ModelNode* child) DataObject_addChild(DataObject* self, ModelNode* child)
{ {
if (self->firstChild == NULL) if (self->firstChild == NULL)
{
self->firstChild = child; self->firstChild = child;
else { }
else
{
ModelNode* lastChild = DataObject_getLastChild(self); ModelNode* lastChild = DataObject_getLastChild(self);
lastChild->sibling = child; lastChild->sibling = child;
@ -706,7 +737,8 @@ DataAttribute_getLastChild(DataAttribute* self)
ModelNode* nextNode = lastNode; ModelNode* nextNode = lastNode;
while (nextNode != NULL) { while (nextNode)
{
lastNode = nextNode; lastNode = nextNode;
nextNode = (ModelNode*)nextNode->sibling; nextNode = (ModelNode*)nextNode->sibling;
} }
@ -718,8 +750,11 @@ static void
DataAttribute_addChild(DataAttribute* self, ModelNode* child) DataAttribute_addChild(DataAttribute* self, ModelNode* child)
{ {
if (self->firstChild == NULL) if (self->firstChild == NULL)
{
self->firstChild = child; self->firstChild = child;
else { }
else
{
ModelNode* lastChild = DataAttribute_getLastChild(self); ModelNode* lastChild = DataAttribute_getLastChild(self);
lastChild->sibling = child; lastChild->sibling = child;
@ -805,10 +840,12 @@ DataAttribute_getTrgOps(DataAttribute* self)
void void
DataAttribute_setValue(DataAttribute* self, MmsValue* value) DataAttribute_setValue(DataAttribute* self, MmsValue* value)
{ {
if (self->mmsValue) { if (self->mmsValue)
{
MmsValue_update(self->mmsValue, value); MmsValue_update(self->mmsValue, value);
} }
else { else
{
self->mmsValue = MmsValue_clone(value); self->mmsValue = MmsValue_clone(value);
} }
} }
@ -869,7 +906,7 @@ DataSet_addEntry(DataSet* self, DataSetEntry* newEntry)
{ {
DataSetEntry* lastEntry = self->fcdas; DataSetEntry* lastEntry = self->fcdas;
while (lastEntry != NULL) while (lastEntry)
{ {
if (lastEntry->sibling == NULL) { if (lastEntry->sibling == NULL) {
lastEntry->sibling = newEntry; lastEntry->sibling = newEntry;
@ -894,7 +931,7 @@ DataSetEntry_create(DataSet* dataSet, const char* variable, int index, const cha
char* separator = strchr(variableName, '/'); char* separator = strchr(variableName, '/');
if (separator != NULL) if (separator)
{ {
*separator = 0; *separator = 0;
@ -909,7 +946,7 @@ DataSetEntry_create(DataSet* dataSet, const char* variable, int index, const cha
self->isLDNameDynamicallyAllocated = false; self->isLDNameDynamicallyAllocated = false;
} }
if (component != NULL) if (component)
self->componentName = StringUtils_copyString(component); self->componentName = StringUtils_copyString(component);
else else
self->componentName = NULL; self->componentName = NULL;
@ -936,7 +973,7 @@ ModelNode_destroy(ModelNode* modelNode)
ModelNode* currentChild = modelNode->firstChild; ModelNode* currentChild = modelNode->firstChild;
while (currentChild != NULL) while (currentChild)
{ {
ModelNode* nextChild = currentChild->sibling; ModelNode* nextChild = currentChild->sibling;
@ -949,7 +986,8 @@ ModelNode_destroy(ModelNode* modelNode)
{ {
DataAttribute* dataAttribute = (DataAttribute*)modelNode; DataAttribute* dataAttribute = (DataAttribute*)modelNode;
if (dataAttribute->mmsValue != NULL) { if (dataAttribute->mmsValue)
{
MmsValue_delete(dataAttribute->mmsValue); MmsValue_delete(dataAttribute->mmsValue);
dataAttribute->mmsValue = NULL; dataAttribute->mmsValue = NULL;
} }
@ -962,14 +1000,15 @@ ModelNode_destroy(ModelNode* modelNode)
void void
IedModel_destroy(IedModel* model) IedModel_destroy(IedModel* model)
{ {
if (model) { if (model)
{
/* delete all model nodes and dynamically created strings */ /* delete all model nodes and dynamically created strings */
/* delete all logical devices */ /* delete all logical devices */
LogicalDevice* ld = model->firstChild; LogicalDevice* ld = model->firstChild;
while (ld != NULL) while (ld)
{ {
if (ld->name) if (ld->name)
GLOBAL_FREEMEM(ld->name); GLOBAL_FREEMEM(ld->name);
@ -979,7 +1018,7 @@ IedModel_destroy(IedModel* model)
LogicalNode* ln = (LogicalNode*)ld->firstChild; LogicalNode* ln = (LogicalNode*)ld->firstChild;
while (ln != NULL) while (ln)
{ {
GLOBAL_FREEMEM(ln->name); GLOBAL_FREEMEM(ln->name);
@ -987,7 +1026,8 @@ IedModel_destroy(IedModel* model)
DataObject* currentDataObject = (DataObject*)ln->firstChild; DataObject* currentDataObject = (DataObject*)ln->firstChild;
while (currentDataObject != NULL) { while (currentDataObject)
{
DataObject* nextDataObject = (DataObject*)currentDataObject->sibling; DataObject* nextDataObject = (DataObject*)currentDataObject->sibling;
ModelNode_destroy((ModelNode*)currentDataObject); ModelNode_destroy((ModelNode*)currentDataObject);
@ -1011,17 +1051,19 @@ IedModel_destroy(IedModel* model)
DataSet* dataSet = model->dataSets; DataSet* dataSet = model->dataSets;
while (dataSet != NULL) { while (dataSet)
{
DataSet* nextDataSet = dataSet->sibling; DataSet* nextDataSet = dataSet->sibling;
GLOBAL_FREEMEM(dataSet->name); GLOBAL_FREEMEM(dataSet->name);
DataSetEntry* dse = dataSet->fcdas; DataSetEntry* dse = dataSet->fcdas;
while (dse != NULL) { while (dse)
{
DataSetEntry* nextDse = dse->sibling; DataSetEntry* nextDse = dse->sibling;
if (dse->componentName != NULL) if (dse->componentName)
GLOBAL_FREEMEM(dse->componentName); GLOBAL_FREEMEM(dse->componentName);
GLOBAL_FREEMEM(dse->variableName); GLOBAL_FREEMEM(dse->variableName);
@ -1043,7 +1085,8 @@ IedModel_destroy(IedModel* model)
ReportControlBlock* rcb = model->rcbs; ReportControlBlock* rcb = model->rcbs;
while (rcb != NULL) { while (rcb)
{
ReportControlBlock* nextRcb = rcb->sibling; ReportControlBlock* nextRcb = rcb->sibling;
GLOBAL_FREEMEM(rcb->name); GLOBAL_FREEMEM(rcb->name);
@ -1063,7 +1106,8 @@ IedModel_destroy(IedModel* model)
GSEControlBlock* gcb = model->gseCBs; GSEControlBlock* gcb = model->gseCBs;
while (gcb != NULL) { while (gcb)
{
GSEControlBlock* nextGcb = gcb->sibling; GSEControlBlock* nextGcb = gcb->sibling;
GLOBAL_FREEMEM(gcb->name); GLOBAL_FREEMEM(gcb->name);
@ -1078,11 +1122,12 @@ IedModel_destroy(IedModel* model)
gcb = nextGcb; gcb = nextGcb;
} }
/* delete setting controls */ /* delete setting group controls */
SettingGroupControlBlock* sgcb = model->sgcbs; SettingGroupControlBlock* sgcb = model->sgcbs;
while (sgcb != NULL) { while (sgcb)
{
SettingGroupControlBlock* nextSgcb = sgcb->sibling; SettingGroupControlBlock* nextSgcb = sgcb->sibling;
GLOBAL_FREEMEM(sgcb); GLOBAL_FREEMEM(sgcb);
@ -1093,7 +1138,8 @@ IedModel_destroy(IedModel* model)
/* delete all LCBs */ /* delete all LCBs */
LogControlBlock* lcb = model->lcbs; LogControlBlock* lcb = model->lcbs;
while (lcb != NULL) { while (lcb)
{
LogControlBlock* nextLcb = lcb->sibling; LogControlBlock* nextLcb = lcb->sibling;
if (lcb->name) if (lcb->name)
@ -1113,7 +1159,8 @@ IedModel_destroy(IedModel* model)
/* delete all LOGs */ /* delete all LOGs */
Log* log = model->logs; Log* log = model->logs;
while (log != NULL) { while (log)
{
Log* nextLog = log->sibling; Log* nextLog = log->sibling;
if (log->name) if (log->name)

Loading…
Cancel
Save