Code scrub:

[mirror_edk2.git] / MdePkg / Library / BaseLib / String.c

diff --git a/MdePkg/Library/BaseLib/String.c b/MdePkg/Library/BaseLib/String.c
index 909262e5872f78e81c4b947acfd7498157450894..bdfa7a3c6d15c7756190ea42cbe104ed8af6ce05 100644 (file)
--- a/MdePkg/Library/BaseLib/String.c
+++ b/MdePkg/Library/BaseLib/String.c
@@ -193,7 +193,7 @@ StrLen (
 \r
   @param  String  Pointer to a Null-terminated Unicode string.\r
 \r
-  @return The size of String.\r
+  @return The size in bytes of String.\r
 \r
 **/\r
 UINTN\r
@@ -291,7 +291,7 @@ StrnCmp (
   IN      UINTN                     Length\r
   )\r
 {\r
-  if (Length == 0) {\r
+  if (0 == Length) {\r
     return 0;\r
   }\r
 \r
@@ -469,7 +469,7 @@ StrStr (
       SearchStringTmp++;\r
     } \r
     \r
-    if (*SearchStringTmp == '\0') {\r
+    if ('\0' == *SearchStringTmp) {\r
       return (CHAR16 *) FirstMatch;\r
     }\r
 \r
@@ -641,14 +641,14 @@ StrDecimalToUintn (
   //\r
   // Ignore the pad spaces (space or tab)\r
   //\r
-  while ((*String == L' ') || (*String == L'\t')) {\r
+  while ((L' ' ==*String) || (L'\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == L'0') {\r
+  while (L'0' == *String) {\r
     String++;\r
   }\r
 \r
@@ -660,7 +660,7 @@ StrDecimalToUintn (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
     ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_10) ||\r
-      ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_10) &&\r
+      ((QUIENT_MAX_UINTN_DIVIDED_BY_10 == Result) &&\r
       (*String - L'0') <= REMINDER_MAX_UINTN_DIVIDED_BY_10)\r
       );\r
 \r
@@ -723,14 +723,14 @@ StrDecimalToUint64 (
   //\r
   // Ignore the pad spaces (space or tab)\r
   //\r
-  while ((*String == L' ') || (*String == L'\t')) {\r
+  while ((L' ' == *String) || (L'\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == L'0') {\r
+  while (L'0' == *String) {\r
     String++;\r
   }\r
 \r
@@ -742,7 +742,7 @@ StrDecimalToUint64 (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
     ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_10) || \r
-      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_10) && \r
+      ((QUIENT_MAX_UINT64_DIVIDED_BY_10 == Result) && \r
       (*String - L'0') <= REMINDER_MAX_UINT64_DIVIDED_BY_10)\r
       );\r
 \r
@@ -805,19 +805,19 @@ StrHexToUintn (
   //\r
   // Ignore the pad spaces (space or tab) \r
   //\r
-  while ((*String == L' ') || (*String == L'\t')) {\r
+  while ((L' ' == *String) || (L'\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == L'0') {\r
+  while (L'0' == *String) {\r
     String++;\r
   }\r
 \r
   if (InternalCharToUpper (*String) == L'X') {\r
-    ASSERT (*(String - 1)  == L'0');\r
+    ASSERT (L'0' == *(String - 1));\r
     if (*(String - 1)  != L'0') {\r
       return 0;\r
     }\r
@@ -835,7 +835,7 @@ StrHexToUintn (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
     ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_16) ||\r
-      ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_16) && \r
+      ((QUIENT_MAX_UINTN_DIVIDED_BY_16 == Result) && \r
       (InternalHexCharToUintn (*String) <= REMINDER_MAX_UINTN_DIVIDED_BY_16))\r
       );\r
 \r
@@ -899,19 +899,19 @@ StrHexToUint64 (
   //\r
   // Ignore the pad spaces (space or tab) \r
   //\r
-  while ((*String == L' ') || (*String == L'\t')) {\r
+  while ((L' ' == *String) || (L'\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == L'0') {\r
+  while (L'0' == *String) {\r
     String++;\r
   }\r
 \r
   if (InternalCharToUpper (*String) == L'X') {\r
-    ASSERT (*(String - 1)  == L'0');\r
+    ASSERT (L'0' == *(String - 1));\r
     if (*(String - 1)  != L'0') {\r
       return 0;\r
     }\r
@@ -929,7 +929,7 @@ StrHexToUint64 (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
     ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_16)|| \r
-      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_16) && \r
+      ((QUIENT_MAX_UINT64_DIVIDED_BY_16 == Result) && \r
       (InternalHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))\r
       );\r
 \r
@@ -1153,7 +1153,7 @@ AsciiStrnCpy (
 {\r
   CHAR8                             *ReturnValue;\r
 \r
-  if (Length == 0) {\r
+  if (0 == Length) {\r
     return Destination;\r
   }\r
 \r
@@ -1432,7 +1432,7 @@ AsciiStrnCmp (
   IN      UINTN                     Length\r
   )\r
 {\r
-  if (Length == 0) {\r
+  if (0 == Length) {\r
     return 0;\r
   }\r
 \r
@@ -1662,14 +1662,14 @@ AsciiStrDecimalToUintn (
   //\r
   // Ignore the pad spaces (space or tab)\r
   //\r
-  while ((*String == ' ') || (*String == '\t')) {\r
+  while ((' ' == *String) || ('\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == '0') {\r
+  while ('0' == *String) {\r
     String++;\r
   }\r
 \r
@@ -1681,7 +1681,7 @@ AsciiStrDecimalToUintn (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
     ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_10) ||\r
-      ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_10) && \r
+      ((QUIENT_MAX_UINTN_DIVIDED_BY_10 == Result) && \r
       (*String - '0') <= REMINDER_MAX_UINTN_DIVIDED_BY_10)\r
       );\r
 \r
@@ -1739,14 +1739,14 @@ AsciiStrDecimalToUint64 (
   //\r
   // Ignore the pad spaces (space or tab)\r
   //\r
-  while ((*String == ' ') || (*String == '\t')) {\r
+  while ((' ' == *String) || ('\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == '0') {\r
+  while ('0' == *String) {\r
     String++;\r
   }\r
 \r
@@ -1758,7 +1758,7 @@ AsciiStrDecimalToUint64 (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
     ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_10) || \r
-      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_10) && \r
+      ((QUIENT_MAX_UINT64_DIVIDED_BY_10 == Result) && \r
       (*String - '0') <= REMINDER_MAX_UINT64_DIVIDED_BY_10)\r
       );\r
 \r
@@ -1819,19 +1819,19 @@ AsciiStrHexToUintn (
   //\r
   // Ignore the pad spaces (space or tab) \r
   //\r
-  while ((*String == ' ') || (*String == '\t')) {\r
+  while ((' ' == *String) || ('\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == '0') {\r
+  while ('0' == *String) {\r
     String++;\r
   }\r
 \r
   if (AsciiToUpper (*String) == 'X') {\r
-    ASSERT (*(String - 1)  == '0');\r
+    ASSERT ('0' == *(String - 1));\r
     if (*(String - 1)  != '0') {\r
       return 0;\r
     }\r
@@ -1849,7 +1849,7 @@ AsciiStrHexToUintn (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
      ASSERT ((Result < QUIENT_MAX_UINTN_DIVIDED_BY_16) ||\r
-       ((Result == QUIENT_MAX_UINTN_DIVIDED_BY_16) && \r
+       ((QUIENT_MAX_UINTN_DIVIDED_BY_16 == Result) && \r
        (InternalAsciiHexCharToUintn (*String) <= REMINDER_MAX_UINTN_DIVIDED_BY_16))\r
        );\r
 \r
@@ -1914,19 +1914,19 @@ AsciiStrHexToUint64 (
   //\r
   // Ignore the pad spaces (space or tab) \r
   //\r
-  while ((*String == ' ') || (*String == '\t')) {\r
+  while ((' ' == *String) || ('\t' == *String)) {\r
     String++;\r
   }\r
 \r
   //\r
   // Ignore leading Zeros after the spaces\r
   //\r
-  while (*String == '0') {\r
+  while ('0' == *String) {\r
     String++;\r
   }\r
 \r
   if (AsciiToUpper (*String) == 'X') {\r
-    ASSERT (*(String - 1)  == '0');\r
+    ASSERT ('0' == *(String - 1));\r
     if (*(String - 1)  != '0') {\r
       return 0;\r
     }\r
@@ -1944,7 +1944,7 @@ AsciiStrHexToUint64 (
     // to the range defined by UINTN, then ASSERT().\r
     //\r
     ASSERT ((Result < QUIENT_MAX_UINT64_DIVIDED_BY_16) ||\r
-      ((Result == QUIENT_MAX_UINT64_DIVIDED_BY_16) && \r
+      ((QUIENT_MAX_UINT64_DIVIDED_BY_16 == Result) && \r
       (InternalAsciiHexCharToUintn (*String) <= REMINDER_MAX_UINT64_DIVIDED_BY_16))\r
       );\r
 \r