From de2ce1d0088687a19b10b6460a0618d9b2a128a5 Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Sat, 30 Jan 2021 08:46:04 +0100 Subject: [PATCH] - removed some compiler warnings (when compiling with clang) --- examples/iec61850_client_example_files/file-tool.c | 6 +++--- src/mms/iso_mms/server/mms_file_service.c | 7 +++++-- src/sampled_values/sv_subscriber.c | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/examples/iec61850_client_example_files/file-tool.c b/examples/iec61850_client_example_files/file-tool.c index f477b47f..f538db97 100644 --- a/examples/iec61850_client_example_files/file-tool.c +++ b/examples/iec61850_client_example_files/file-tool.c @@ -102,13 +102,13 @@ downloadHandler(void* parameter, uint8_t* buffer, uint32_t bytesRead) printf("received %i bytes\n", bytesRead); if (bytesRead > 0) { - if (fwrite(buffer, bytesRead, 1, fp) == 1) - return true; - else { + if (fwrite(buffer, bytesRead, 1, fp) != 1) { printf("Failed to write local file!\n"); return false; } } + + return true; } static void diff --git a/src/mms/iso_mms/server/mms_file_service.c b/src/mms/iso_mms/server/mms_file_service.c index 2c1831f1..d569fab6 100644 --- a/src/mms/iso_mms/server/mms_file_service.c +++ b/src/mms/iso_mms/server/mms_file_service.c @@ -535,6 +535,7 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task) FileSystem_closeFile(task->fileHandle); task->fileHandle = NULL; } + deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename); if (DEBUG_MMS_SERVER) @@ -563,7 +564,7 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task) FileSystem_closeFile(task->fileHandle); task->fileHandle = NULL; - if (task->destinationFilename) + if (task->destinationFilename[0]) deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename); } @@ -599,10 +600,12 @@ mmsServer_fileUploadTask(MmsServer self, MmsObtainFileTask task) { if (DEBUG_MMS_SERVER) printf("MMS_SERVER: file service interrupted, due to client disconnection\n"); + if (task->fileHandle){ FileSystem_closeFile(task->fileHandle); task->fileHandle = NULL; - if (task->destinationFilename) + + if (task->destinationFilename[0]) deleteFile(MmsServerConnection_getFilesystemBasepath(task->connection), task->destinationFilename); } task->state = MMS_FILE_UPLOAD_STATE_NOT_USED; diff --git a/src/sampled_values/sv_subscriber.c b/src/sampled_values/sv_subscriber.c index 106430e0..6e6904df 100644 --- a/src/sampled_values/sv_subscriber.c +++ b/src/sampled_values/sv_subscriber.c @@ -356,7 +356,7 @@ parseASDU(SVReceiver self, SVSubscriber subscriber, uint8_t* buffer, int length) if (SVSubscriber_ASDU_hasDatSet(&asdu)) printf("SV_SUBSCRIBER: DatSet: %s\n", asdu.datSet); if (SVSubscriber_ASDU_hasRefrTm(&asdu)) - printf("SV_SUBSCRIBER: RefrTm[ns]: %lu\n", SVSubscriber_ASDU_getRefrTmAsNs(&asdu)); + printf("SV_SUBSCRIBER: RefrTm[ns]: %llu\n", SVSubscriber_ASDU_getRefrTmAsNs(&asdu)); if (SVSubscriber_ASDU_hasSmpMod(&asdu)) printf("SV_SUBSCRIBER: SmpMod: %d\n", SVSubscriber_ASDU_getSmpMod(&asdu)); if (SVSubscriber_ASDU_hasSmpRate(&asdu))