Rename the standard functions in the LibFdtSupport to remove conflicts
with other libraries that define them.
Signed-off-by: Jeff Brasen <jbra...@nvidia.com>
---
MdePkg/Library/BaseFdtLib/LibFdtSupport.h | 16 +++++++++++++++
MdePkg/Library/BaseFdtLib/LibFdtWrapper.c | 25 ++---------------------
2 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/MdePkg/Library/BaseFdtLib/LibFdtSupport.h
b/MdePkg/Library/BaseFdtLib/LibFdtSupport.h
index 393019324b..47beac9fac 100644
--- a/MdePkg/Library/BaseFdtLib/LibFdtSupport.h
+++ b/MdePkg/Library/BaseFdtLib/LibFdtSupport.h
@@ -68,6 +68,12 @@ strrchr (
int
);
+char *
+fdt_strrchr (
+ const char *,
+ int
+ );
+
unsigned long
strtoul (
const char *,
@@ -75,6 +81,13 @@ strtoul (
int
);
+unsigned long
+fdt_strtoul (
+ const char *,
+ char **,
+ int
+ );
+
char *
strcpy (
char *strDest,
@@ -93,7 +106,10 @@ strcpy (
#define strnlen(str, count) (size_t)(AsciiStrnLenS(str, count))
#define strncpy(strDest, strSource, count) AsciiStrnCpyS(strDest,
MAX_STRING_SIZE, strSource, (UINTN)count)
#define strcat(strDest, strSource) AsciiStrCatS(strDest,
MAX_STRING_SIZE, strSource)
+#define strchr(str, ch) ScanMem8(str, AsciiStrSize (str),
(UINT8)ch)
#define strcmp(string1, string2, count) (int)(AsciiStrCmp(string1,
string2))
#define strncmp(string1, string2, count) (int)(AsciiStrnCmp(string1,
string2, (UINTN)(count)))
+#define strrchr(str, ch) fdt_strrchr(str, ch)
+#define strtoul(ptr, end_ptr, base) fdt_strtoul(ptr, end_ptr, base)
#endif /* FDT_LIB_SUPPORT_H_ */
diff --git a/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c
b/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c
index ef6452914f..1a4cd573fd 100644
--- a/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c
+++ b/MdePkg/Library/BaseFdtLib/LibFdtWrapper.c
@@ -18,28 +18,7 @@
// so the code gets a bit clunky to handle that case specifically.
char *
-strchr (
- const char *Str,
- int Char
- )
-{
- char *S;
-
- S = (char *)Str;
-
- for ( ; ; S++) {
- if (*S == Char) {
- return S;
- }
-
- if (*S == '\0') {
- return NULL;
- }
- }
-}
-
-char *
-strrchr (
+fdt_strrchr (
const char *Str,
int Char
)
@@ -71,7 +50,7 @@ __isspace (
}
unsigned long
-strtoul (
+fdt_strtoul (
const char *Nptr,
char **EndPtr,
int Base
--
2.34.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#112308): https://edk2.groups.io/g/devel/message/112308
Mute This Topic: https://groups.io/mt/103110792/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
