ArmPkg: Fix Ecc error 5007 in CompilerIntrinsicsLib

This patch fixes the following Ecc reported error:
There should be no initialization of a variable as
part of its declaration

Signed-off-by: Pierre Gondois <Pierre.Gondois@arm.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@arm.com>

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
index e6b34b273bd2cc4b28426f72211ba1b5ac6c0995..b0e0322951d41f9435b76582cef58e22f61ad8c2 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c
@@ -18,8 +18,11 @@ int memcmp(void *, void *, size_t);
 #pragma function(memcmp)\r
 int memcmp(const void *s1, const void *s2, size_t n)\r
 {\r
-  unsigned char const *t1 = s1;\r
-  unsigned char const *t2 = s2;\r
+  unsigned char const *t1;\r
+  unsigned char const *t2;\r
+\r
+  t1 = s1;\r
+  t2 = s2;\r
 \r
   while (n-- != 0) {\r
     if (*t1 != *t2)\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
index 942b888e3d0644acd43eea6251be4277b420c69a..e1d0b72782d7d9407676b9783f966c007b5a4b04 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c
@@ -11,8 +11,11 @@ typedef __SIZE_TYPE__ size_t;
 \r
 static void __memcpy(void *dest, const void *src, size_t n)\r
 {\r
-  unsigned char *d = dest;\r
-  unsigned char const *s = src;\r
+  unsigned char *d;\r
+  unsigned char const *s;\r
+\r
+  d = dest;\r
+  s = src;\r
 \r
   while (n-- != 0) {\r
     *d++ = *s++;\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
index fe5b1d04c7c21451c085fa6fdf51347709b18ae8..a52fd8deefc681181ee4e70f02c0a6e62f3d3408 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c
@@ -18,8 +18,11 @@ void* memcpy(void *, const void *, size_t);
 #pragma function(memcpy)\r
 void* memcpy(void *dest, const void *src, size_t n)\r
 {\r
-  unsigned char *d = dest;\r
-  unsigned char const *s = src;\r
+  unsigned char *d;\r
+  unsigned char const *s;\r
+\r
+  d = dest;\r
+  s = src;\r
 \r
   while (n-- != 0) {\r
     *d++ = *s++;\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c
index 3a8e3e967f41734843438d402b11ddf6dd3af804..ebc9e385aafa922303fa83d0a4767301061bbac8 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c
@@ -18,8 +18,11 @@ void* memmove(void *, const void *, size_t);
 #pragma function(memmove)\r
 void* memmove(void *dest, const void *src, size_t n)\r
 {\r
-  unsigned char *d = dest;\r
-  unsigned char const *s = src;\r
+  unsigned char *d;\r
+  unsigned char const *s;\r
+\r
+  d = dest;\r
+  s = src;\r
 \r
   if (d < s) {\r
     while (n-- != 0) {\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
index 1a36aeaa5684f0b387d3b9bfbeb695d96a2e6695..63f6cf68a6895ce6732db50c20f12a2c4a29fc84 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c
@@ -12,7 +12,9 @@ typedef __SIZE_TYPE__ size_t;
 static __attribute__((__used__))\r
 void *__memset(void *s, int c, size_t n)\r
 {\r
-  unsigned char *d = s;\r
+  unsigned char *d;\r
+\r
+  d = s;\r
 \r
   while (n-- != 0) {\r
     *d++ = c;\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
index c046b8be8606fba26a7045a25436afc5ea2abdfc..b88a5f2c5f2597ba9d8491d2037b3d8f4ce04735 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c
@@ -18,7 +18,9 @@ void* memset(void *, int, size_t);
 #pragma function(memset)\r
 void *memset(void *s, int c, size_t n)\r
 {\r
-  unsigned char *d = s;\r
+  unsigned char *d;\r
+\r
+  d = s;\r
 \r
   while (n-- != 0) {\r
     *d++ = (unsigned char)c;\r