Fix static analysis errors
Fix checkpatch and cppcheck findings in newly added FWU files.
Change-Id: Ie6a877e65b758399647ceda345ae22081d911f8e
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
diff --git a/components/service/fwu/agent/img_dir_serializer.c b/components/service/fwu/agent/img_dir_serializer.c
index db210bc..d1f44af 100644
--- a/components/service/fwu/agent/img_dir_serializer.c
+++ b/components/service/fwu/agent/img_dir_serializer.c
@@ -5,19 +5,17 @@
*
*/
-#include <assert.h>
-#include <string.h>
-#include <protocols/service/fwu/packed-c/fwu_proto.h>
-#include <service/fwu/fw_store/fw_store.h>
-#include "fw_directory.h"
#include "img_dir_serializer.h"
-int img_dir_serializer_serialize(
- const struct fw_directory *fw_dir,
- const struct fw_store *fw_store,
- uint8_t *buf,
- size_t buf_size,
- size_t *data_len)
+#include <assert.h>
+#include <string.h>
+
+#include "fw_directory.h"
+#include "protocols/service/fwu/packed-c/fwu_proto.h"
+#include "service/fwu/fw_store/fw_store.h"
+
+int img_dir_serializer_serialize(const struct fw_directory *fw_dir, const struct fw_store *fw_store,
+ uint8_t *buf, size_t buf_size, size_t *data_len)
{
size_t serialized_len = img_dir_serializer_get_len(fw_dir);
@@ -45,24 +43,19 @@
/* Serialize image info for each image */
for (size_t image_index = 0; image_index < output->num_images; image_index++) {
-
const struct image_info *image_info =
fw_directory_get_image_info(fw_dir, image_index);
assert(image_info);
memcpy(output->img_info_entry[image_index].img_type_uuid,
- image_info->img_type_uuid.octets,
- OSF_UUID_OCTET_LEN);
+ image_info->img_type_uuid.octets, OSF_UUID_OCTET_LEN);
- output->img_info_entry[image_index].client_permissions =
- image_info->permissions;
- output->img_info_entry[image_index].img_max_size =
- image_info->max_size;
+ output->img_info_entry[image_index].client_permissions = image_info->permissions;
+ output->img_info_entry[image_index].img_max_size = image_info->max_size;
output->img_info_entry[image_index].lowest_accepted_version =
image_info->lowest_accepted_version;
- output->img_info_entry[image_index].img_version =
- image_info->active_version;
+ output->img_info_entry[image_index].img_version = image_info->active_version;
output->img_info_entry[image_index].accepted =
(uint32_t)fw_store_is_accepted(fw_store, image_info);
}
@@ -72,10 +65,8 @@
return FWU_STATUS_SUCCESS;
}
-size_t img_dir_serializer_get_len(
- const struct fw_directory *fw_dir)
+size_t img_dir_serializer_get_len(const struct fw_directory *fw_dir)
{
- return
- offsetof(struct ts_fwu_image_directory, img_info_entry) +
- sizeof(struct ts_fwu_image_info_entry) * fw_directory_num_images(fw_dir);
+ return offsetof(struct ts_fwu_image_directory, img_info_entry) +
+ sizeof(struct ts_fwu_image_info_entry) * fw_directory_num_images(fw_dir);
}