From 2f8f4395cfa55cdd16273c50f70b37d4c14b982a Mon Sep 17 00:00:00 2001 From: temi54c1l8 Date: Thu, 13 Jun 2024 15:01:19 +0200 Subject: [PATCH] CO_storage: static analysis: refactoring OD_extension_init with ignore return value because verify arguments at function entry --- storage/CO_storage.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/storage/CO_storage.c b/storage/CO_storage.c index b8c5538..f4068d6 100644 --- a/storage/CO_storage.c +++ b/storage/CO_storage.c @@ -154,7 +154,9 @@ CO_ReturnError_t CO_storage_init(CO_storage_t *storage, uint8_t entriesCount) { /* verify arguments */ - if (storage == NULL) { + if ((storage == NULL) || (CANmodule == NULL) || (OD_1010_StoreParameters == NULL) || (OD_1011_RestoreDefaultParameters == NULL) + || (store == NULL) || (restore == NULL) || (entries == NULL) + ) { return CO_ERROR_ILLEGAL_ARGUMENT; } @@ -166,20 +168,16 @@ CO_ReturnError_t CO_storage_init(CO_storage_t *storage, storage->entriesCount = entriesCount; /* configure extensions */ - if (OD_1010_StoreParameters != NULL) { - storage->OD_1010_extension.object = storage; - storage->OD_1010_extension.read = OD_readOriginal; - storage->OD_1010_extension.write = OD_write_1010; - OD_extension_init(OD_1010_StoreParameters, &storage->OD_1010_extension); - } + storage->OD_1010_extension.object = storage; + storage->OD_1010_extension.read = OD_readOriginal; + storage->OD_1010_extension.write = OD_write_1010; + (void)OD_extension_init(OD_1010_StoreParameters, &storage->OD_1010_extension); - if (OD_1011_RestoreDefaultParameters != NULL) { - storage->OD_1011_extension.object = storage; - storage->OD_1011_extension.read = OD_readOriginal; - storage->OD_1011_extension.write = OD_write_1011; - OD_extension_init(OD_1011_RestoreDefaultParameters, - &storage->OD_1011_extension); - } + storage->OD_1011_extension.object = storage; + storage->OD_1011_extension.read = OD_readOriginal; + storage->OD_1011_extension.write = OD_write_1011; + (void)OD_extension_init(OD_1011_RestoreDefaultParameters, + &storage->OD_1011_extension); return CO_ERROR_NO; }