Removing unused end spaces

pull/462/head
AJIOB 2 years ago
parent 7f551b2238
commit 9150ef5492

@ -856,7 +856,7 @@ parseGoosePayload(GooseReceiver self, uint8_t* buffer, int apduLength)
MmsValue_setUtcTime(matchingSubscriber->timestamp, 0); MmsValue_setUtcTime(matchingSubscriber->timestamp, 0);
} }
if (matchingSubscriber->isObserver && matchingSubscriber->dataSetValues != NULL) { if (matchingSubscriber->isObserver && matchingSubscriber->dataSetValues != NULL) {
MmsValue_delete(matchingSubscriber->dataSetValues); MmsValue_delete(matchingSubscriber->dataSetValues);
matchingSubscriber->dataSetValues = NULL; matchingSubscriber->dataSetValues = NULL;
@ -934,7 +934,7 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes)
return; return;
if (buffer[bufPos++] != 0xb8) if (buffer[bufPos++] != 0xb8)
return; return;
uint8_t srcMac[6]; uint8_t srcMac[6];
memcpy(srcMac,&buffer[6],6); memcpy(srcMac,&buffer[6],6);
@ -976,7 +976,7 @@ parseGooseMessage(GooseReceiver self, uint8_t* buffer, int numbytes)
while (element != NULL) { while (element != NULL) {
GooseSubscriber subscriber = (GooseSubscriber) LinkedList_getData(element); GooseSubscriber subscriber = (GooseSubscriber) LinkedList_getData(element);
if (subscriber->isObserver) if (subscriber->isObserver)
{ {
subscriber->appId = appId; subscriber->appId = appId;

@ -652,11 +652,11 @@ IedConnection_tick(IedConnection self)
} }
void void
IedConnection_setLocalAddress(IedConnection self, const char* localIpAddress, int localPort) IedConnection_setLocalAddress(IedConnection self, const char* localIpAddress, int localPort)
{ {
MmsConnection connection = self->connection; MmsConnection connection = self->connection;
IsoConnectionParameters isoP = MmsConnection_getIsoConnectionParameters(connection); IsoConnectionParameters isoP = MmsConnection_getIsoConnectionParameters(connection);
IsoConnectionParameters_setLocalTcpParameters(isoP, localIpAddress, localPort); IsoConnectionParameters_setLocalTcpParameters(isoP, localIpAddress, localPort);
} }
@ -4252,4 +4252,3 @@ FileDirectoryEntry_getLastModified(FileDirectoryEntry self)
{ {
return self->lastModified; return self->lastModified;
} }

@ -2550,4 +2550,3 @@ ControlAction_getControlTime(ControlAction self)
} }
#endif /* (CONFIG_IEC61850_CONTROL_SERVICE == 1) */ #endif /* (CONFIG_IEC61850_CONTROL_SERVICE == 1) */

@ -563,5 +563,3 @@ exit_error:
IedModel_destroy(model); IedModel_destroy(model);
return NULL; return NULL;
} }

@ -1867,7 +1867,7 @@ MmsConnection_abort(MmsConnection self, MmsError* mmsError)
} }
} }
if (success == false) { if (success == false) {
IsoClientConnection_close(self->isoClient); IsoClientConnection_close(self->isoClient);
*mmsError = MMS_ERROR_SERVICE_TIMEOUT; *mmsError = MMS_ERROR_SERVICE_TIMEOUT;

@ -436,11 +436,11 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task, int taskState)
ByteBuffer* message = NULL; ByteBuffer* message = NULL;
if (taskState == MMS_FILE_UPLOAD_STATE_SEND_FILE_READ || if (taskState == MMS_FILE_UPLOAD_STATE_SEND_FILE_READ ||
taskState == MMS_FILE_UPLOAD_STATE_SEND_FILE_CLOSE || taskState == MMS_FILE_UPLOAD_STATE_SEND_FILE_CLOSE ||
taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_SOURCE || taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_SOURCE ||
taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_DESTINATION || taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_ERROR_DESTINATION ||
taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_RESPONSE) taskState == MMS_FILE_UPLOAD_STATE_SEND_OBTAIN_FILE_RESPONSE)
{ {
IsoConnection_lock(task->connection->isoConnection); IsoConnection_lock(task->connection->isoConnection);
@ -551,7 +551,7 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task, int taskState)
FileSystem_closeFile(task->fileHandle); FileSystem_closeFile(task->fileHandle);
task->fileHandle = NULL; task->fileHandle = NULL;
} }
deleteFile(MmsServer_getFilesystemBasepath(self), task->destinationFilename); deleteFile(MmsServer_getFilesystemBasepath(self), task->destinationFilename);
if (DEBUG_MMS_SERVER) if (DEBUG_MMS_SERVER)
@ -1051,7 +1051,7 @@ createFileDirectoryResponse(const char* basepath, uint32_t invokeId, ByteBuffer*
continueAfterFileName = NULL; continueAfterFileName = NULL;
} }
if ((directoryName && mmsMsg_isFilenameSave(directoryName) == false) || if ((directoryName && mmsMsg_isFilenameSave(directoryName) == false) ||
(continueAfterFileName && mmsMsg_isFilenameSave(continueAfterFileName) == false)) (continueAfterFileName && mmsMsg_isFilenameSave(continueAfterFileName) == false))
{ {
if (DEBUG_MMS_SERVER) if (DEBUG_MMS_SERVER)
@ -1282,4 +1282,3 @@ mmsServer_handleFileDirectoryRequest(
} }
#endif /* MMS_FILE_SERVICE == 1 */ #endif /* MMS_FILE_SERVICE == 1 */

@ -331,6 +331,3 @@ MmsServerConnection_sendInformationReportVMDSpecific(MmsServerConnection self, c
exit_function: exit_function:
return; return;
} }

@ -922,8 +922,8 @@ mmsServer_handleReadRequest(
goto exit_function; goto exit_function;
} }
if ((mmsPdu->present == MmsPdu_PR_confirmedRequestPdu) && if ((mmsPdu->present == MmsPdu_PR_confirmedRequestPdu) &&
(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.present (mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.present
== ConfirmedServiceRequest_PR_read)) == ConfirmedServiceRequest_PR_read))
{ {
request = &(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.choice.read); request = &(mmsPdu->choice.confirmedRequestPdu.confirmedServiceRequest.choice.read);
@ -950,10 +950,10 @@ mmsServer_handleReadRequest(
} }
#endif #endif
else { else {
mmsMsg_createServiceErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_ACCESS_UNSUPPORTED); mmsMsg_createServiceErrorPdu(invokeId, response, MMS_ERROR_ACCESS_OBJECT_ACCESS_UNSUPPORTED);
} }
exit_function: exit_function:
asn_DEF_MmsPdu.free_struct(&asn_DEF_MmsPdu, mmsPdu, 0); asn_DEF_MmsPdu.free_struct(&asn_DEF_MmsPdu, mmsPdu, 0);
} }
@ -976,4 +976,3 @@ MmsServerConnection_sendReadResponse(MmsServerConnection self, uint32_t invokeId
if (handlerMode == false) if (handlerMode == false)
IsoConnection_unlock(self->isoConnection); IsoConnection_unlock(self->isoConnection);
} }

@ -891,6 +891,3 @@ MmsServerConnection_getFilesystemBasepath(MmsServerConnection self)
return CONFIG_VIRTUAL_FILESTORE_BASEPATH; return CONFIG_VIRTUAL_FILESTORE_BASEPATH;
#endif #endif
} }

@ -254,7 +254,7 @@ SVReceiver_startThreadless(SVReceiver self)
self->running = true; self->running = true;
} }
return self->ethSocket; return self->ethSocket;
} }
@ -343,7 +343,7 @@ parseASDU(SVReceiver self, SVSubscriber subscriber, uint8_t* buffer, int length)
asdu.svId[svIdLength] = 0; asdu.svId[svIdLength] = 0;
if (asdu.datSet != NULL) if (asdu.datSet != NULL)
asdu.datSet[datSetLength] = 0; asdu.datSet[datSetLength] = 0;
if (DEBUG_SV_SUBSCRIBER) { if (DEBUG_SV_SUBSCRIBER) {
printf("SV_SUBSCRIBER: SV ASDU: ----------------\n"); printf("SV_SUBSCRIBER: SV ASDU: ----------------\n");
printf("SV_SUBSCRIBER: DataLength: %d\n", asdu.dataBufferLength); printf("SV_SUBSCRIBER: DataLength: %d\n", asdu.dataBufferLength);
@ -1006,4 +1006,3 @@ SVClientASDU_getDataSize(SVSubscriber_ASDU self)
{ {
return SVSubscriber_ASDU_getDataSize(self); return SVSubscriber_ASDU_getDataSize(self);
} }

Loading…
Cancel
Save