summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Boulby <daniel.boulby@arm.com>2018-05-04 11:18:26 +0100
committerDaniel Boulby <daniel.boulby@arm.com>2018-06-12 13:21:36 +0100
commitd3775d46a43a47c521193229cfcb1c0d6cb4878b (patch)
treef72d4803322d9c256f22dd1346ef0090e64ce791
parent87d3aacc88f43ec162ef3983f2261b9c9296fc68 (diff)
Fix MISRA Rule 5.3 Part 1
Conflict with function name and variable name within that function. Change the name of the function from image_size to get_image_size to remove conflict and make the function fit the normal project naming convention. Rule 5.3: An identifier declared in an inner scope shall not hide an identifier declared in an outer scope Fixed For: make LOG_LEVEL=50 PLAT=fvp Change-Id: I1a63d2730113e2741fffa79730459c584b0224d7 Signed-off-by: Daniel Boulby <daniel.boulby@arm.com>
-rw-r--r--common/bl_common.c2
-rw-r--r--include/common/bl_common.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/common/bl_common.c b/common/bl_common.c
index 6b979f64..af51c07d 100644
--- a/common/bl_common.c
+++ b/common/bl_common.c
@@ -184,7 +184,7 @@ static void dump_load_info(uintptr_t image_load_addr,
#endif /* LOAD_IMAGE_V2 */
/* Generic function to return the size of an image */
-size_t image_size(unsigned int image_id)
+size_t get_image_size(unsigned int image_id)
{
uintptr_t dev_handle;
uintptr_t image_handle;
diff --git a/include/common/bl_common.h b/include/common/bl_common.h
index c7c74872..f64e6aee 100644
--- a/include/common/bl_common.h
+++ b/include/common/bl_common.h
@@ -207,7 +207,7 @@ typedef struct bl31_params {
/*******************************************************************************
* Function & variable prototypes
******************************************************************************/
-size_t image_size(unsigned int image_id);
+size_t get_image_size(unsigned int image_id);
int is_mem_free(uintptr_t free_base, size_t free_size,
uintptr_t addr, size_t size);