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/app/metadata_reader.cpp b/components/service/fwu/app/metadata_reader.cpp
index d1507f5..2d38a2f 100644
--- a/components/service/fwu/app/metadata_reader.cpp
+++ b/components/service/fwu/app/metadata_reader.cpp
@@ -4,24 +4,23 @@
* SPDX-License-Identifier: BSD-3-Clause
*/
-#include <media/volume/volume.h>
-#include <media/volume/index/volume_index.h>
-#include <service/fwu/fw_store/banked/volume_id.h>
#include "metadata_reader.h"
+#include "media/volume/index/volume_index.h"
+#include "media/volume/volume.h"
+#include "service/fwu/fw_store/banked/volume_id.h"
+
extern "C" {
-#include <trace.h>
+#include "trace.h"
}
-metadata_reader::metadata_reader() :
- registered_readers()
+metadata_reader::metadata_reader()
+ : registered_readers()
{
-
}
metadata_reader::~metadata_reader()
{
-
}
metadata_reader *metadata_reader::instance()
@@ -35,16 +34,13 @@
registered_readers.push_back(reader);
}
-int metadata_reader::get_boot_info(
- unsigned int &active_index,
- unsigned int &metadata_version) const
+int metadata_reader::get_boot_info(unsigned int &active_index, unsigned int &metadata_version) const
{
struct volume *volume;
int status = volume_index_find(BANKED_VOLUME_ID_PRIMARY_METADATA, &volume);
if (status) {
-
IMSG("Failed to find metadata volume");
return status;
}
@@ -52,7 +48,6 @@
status = volume_open(volume);
if (!status) {
-
/* Assume whatever metadata version is in-use, it will fit in the buffer */
size_t len_read = 0;
uint8_t buf[1000];
@@ -60,15 +55,12 @@
status = volume_read(volume, (uintptr_t)buf, sizeof(buf), &len_read);
if (!status) {
-
bool is_handled = false;
for (unsigned int i = 0; i < registered_readers.size(); i++) {
-
metadata_version_specific_reader *reader = registered_readers[i];
if (reader->is_supported(buf, len_read)) {
-
reader->get_version(buf, len_read, metadata_version);
reader->get_active_index(buf, len_read, active_index);
@@ -78,7 +70,6 @@
}
if (!is_handled) {
-
/* This is normal on first-boot */
status = -1;
}
@@ -93,4 +84,3 @@
return status;
}
-