From 5e39c94cf3f6fc02f028e9998500f9d2a439d9d2 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Thu, 18 Feb 2021 15:47:51 +0100 Subject: [PATCH] - IED server: allow IedServer_setServerIdentity with some parameters set to NULL --- src/iec61850/server/impl/ied_server.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/iec61850/server/impl/ied_server.c b/src/iec61850/server/impl/ied_server.c index ccf6e3d0..d8d0100c 100644 --- a/src/iec61850/server/impl/ied_server.c +++ b/src/iec61850/server/impl/ied_server.c @@ -1642,6 +1642,10 @@ IedServer_setLogStorage(IedServer self, const char* logRef, LogStorage logStorag { #if (CONFIG_IEC61850_LOG_SERVICE == 1) MmsMapping_setLogStorage(self->mmsMapping, logRef, logStorage); +#else + (void)self; + (void)logRef; + (void)logStorage; #endif } @@ -1659,9 +1663,14 @@ IedServer_setServerIdentity(IedServer self, const char* vendor, const char* mode if (self->revision) GLOBAL_FREEMEM(self->revision); - self->vendorName = StringUtils_copyString(vendor); - self->modelName = StringUtils_copyString(model); - self->revision = StringUtils_copyString(revision); + if (vendor) + self->vendorName = StringUtils_copyString(vendor); + + if (model) + self->modelName = StringUtils_copyString(model); + + if (revision) + self->revision = StringUtils_copyString(revision); MmsServer_setServerIdentity(self->mmsServer, self->vendorName, self->modelName, self->revision); #endif