Fix build errors and warnings
Fixes:
- gpt_iterator.h: TF-A:tf-a-src/include/tools_share/uuid.h is not self
contained and does not include stdint.h. As a workround include the
header berfore including TF-A headers.
- installer_factory.c: fix const qualifier lost warnings
- installer_index.h: add missing forward declaration for uuid_octets
Change-Id: I1da2cbebe27978ad32ea0dbc607367fa554cec69
Signed-off-by: Gyorgy Szing <Gyorgy.Szing@arm.com>
diff --git a/components/media/disk/gpt_iterator/gpt_iterator.h b/components/media/disk/gpt_iterator/gpt_iterator.h
index e288aaa..b32be18 100644
--- a/components/media/disk/gpt_iterator/gpt_iterator.h
+++ b/components/media/disk/gpt_iterator/gpt_iterator.h
@@ -14,6 +14,8 @@
extern "C" {
#endif
+//This seems to be missing from TF-A:tf-a-src/include/tools_share/uuid.h
+#include <stdint.h>
/**
* Export tf-a version with C++ linkage support.
*/
diff --git a/components/service/fwu/installer/factory/default/installer_factory.c b/components/service/fwu/installer/factory/default/installer_factory.c
index 611ce93..506f963 100644
--- a/components/service/fwu/installer/factory/default/installer_factory.c
+++ b/components/service/fwu/installer/factory/default/installer_factory.c
@@ -29,7 +29,7 @@
* a separate storage volume.
*/
-static bool check_supported_locations(const char *supported_uuids[],
+static bool check_supported_locations(const char *const supported_uuids[],
const struct uuid_octets *location_uuid)
{
bool is_supported = false;
diff --git a/components/service/fwu/installer/installer_index.h b/components/service/fwu/installer/installer_index.h
index 8e0baf5..81ad05d 100644
--- a/components/service/fwu/installer/installer_index.h
+++ b/components/service/fwu/installer/installer_index.h
@@ -20,6 +20,7 @@
* Interface dependencies
*/
struct installer;
+struct uuid_octets;
/**
* @brief Initialize the installer index
diff --git a/components/service/fwu/test/metadata_checker/metadata_checker.h b/components/service/fwu/test/metadata_checker/metadata_checker.h
index 5c0c7bd..cfbcfc1 100644
--- a/components/service/fwu/test/metadata_checker/metadata_checker.h
+++ b/components/service/fwu/test/metadata_checker/metadata_checker.h
@@ -41,7 +41,7 @@
private:
metadata_checker(const metadata_checker &);
- operator=(const metadata_checker &);
+ const metadata_checker &operator=(const metadata_checker &);
};
#endif /* METADATA_CHECKER_H */