diff options
-rw-r--r-- | ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c | 7 | ||||
-rw-r--r-- | ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c | 7 | ||||
-rw-r--r-- | ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c | 7 | ||||
-rw-r--r-- | ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c | 7 | ||||
-rw-r--r-- | ArmPkg/Library/CompilerIntrinsicsLib/memset.c | 4 | ||||
-rw-r--r-- | ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c | 4 |
6 files changed, 26 insertions, 10 deletions
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcmp_ms.c index e6b34b273b..b0e0322951 100644 --- 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)
int memcmp(const void *s1, const void *s2, size_t n)
{
- unsigned char const *t1 = s1;
- unsigned char const *t2 = s2;
+ unsigned char const *t1;
+ unsigned char const *t2;
+
+ t1 = s1;
+ t2 = s2;
while (n-- != 0) {
if (*t1 != *t2)
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c index 942b888e3d..e1d0b72782 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c +++ b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy.c @@ -11,8 +11,11 @@ typedef __SIZE_TYPE__ size_t; static void __memcpy(void *dest, const void *src, size_t n)
{
- unsigned char *d = dest;
- unsigned char const *s = src;
+ unsigned char *d;
+ unsigned char const *s;
+
+ d = dest;
+ s = src;
while (n-- != 0) {
*d++ = *s++;
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memcpy_ms.c index fe5b1d04c7..a52fd8deef 100644 --- 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)
void* memcpy(void *dest, const void *src, size_t n)
{
- unsigned char *d = dest;
- unsigned char const *s = src;
+ unsigned char *d;
+ unsigned char const *s;
+
+ d = dest;
+ s = src;
while (n-- != 0) {
*d++ = *s++;
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memmove_ms.c index 3a8e3e967f..ebc9e385aa 100644 --- 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)
void* memmove(void *dest, const void *src, size_t n)
{
- unsigned char *d = dest;
- unsigned char const *s = src;
+ unsigned char *d;
+ unsigned char const *s;
+
+ d = dest;
+ s = src;
if (d < s) {
while (n-- != 0) {
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c index 1a36aeaa56..63f6cf68a6 100644 --- a/ArmPkg/Library/CompilerIntrinsicsLib/memset.c +++ b/ArmPkg/Library/CompilerIntrinsicsLib/memset.c @@ -12,7 +12,9 @@ typedef __SIZE_TYPE__ size_t; static __attribute__((__used__))
void *__memset(void *s, int c, size_t n)
{
- unsigned char *d = s;
+ unsigned char *d;
+
+ d = s;
while (n-- != 0) {
*d++ = c;
diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c b/ArmPkg/Library/CompilerIntrinsicsLib/memset_ms.c index c046b8be86..b88a5f2c5f 100644 --- 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)
void *memset(void *s, int c, size_t n)
{
- unsigned char *d = s;
+ unsigned char *d;
+
+ d = s;
while (n-- != 0) {
*d++ = (unsigned char)c;
|