tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MdePkg/BaseFdtLib: Rename standard functions 

Rename the standard functions in the LibFdtSupport to remove conflicts
with other libraries that define them.

Cc: Michael D Kinney <michael.d.kinney@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Zhiguang Liu <zhiguang.liu@intel.com>
Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>
Reviewed-by: Michael D Kinney <michael.d.kinney@intel.com>
This commit is contained in:
Jeff Brasen 2024-01-23 15:15:46 -08:00 committed by mergify[bot]
parent 1063665fa5
commit d24187a81f
2 changed files with 7 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
MdePkg/Library/BaseFdtLib/LibFdtSupport.h
View File

@ -63,13 +63,13 @@ strchr (
); );
char * char *
strrchr ( fdt_strrchr (
const char *, const char *,
int int
); );
unsigned long unsigned long
strtoul ( fdt_strtoul (
const char *, const char *,
char **, char **,
int int
@ -93,7 +93,10 @@ strcpy (
#define strnlen(str, count) (size_t)(AsciiStrnLenS(str, count)) #define strnlen(str, count) (size_t)(AsciiStrnLenS(str, count))
#define strncpy(strDest, strSource, count) AsciiStrnCpyS(strDest, MAX_STRING_SIZE, strSource, (UINTN)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 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 strcmp(string1, string2, count) (int)(AsciiStrCmp(string1, string2))
#define strncmp(string1, string2, count) (int)(AsciiStrnCmp(string1, string2, (UINTN)(count))) #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_ */ #endif /* FDT_LIB_SUPPORT_H_ */

25
MdePkg/Library/BaseFdtLib/LibFdtWrapper.c
View File

@ -18,28 +18,7 @@
// so the code gets a bit clunky to handle that case specifically. // so the code gets a bit clunky to handle that case specifically.
char * char *
strchr ( fdt_strrchr (
const char *Str,
int Char
)
{
char *S;
S = (char *)Str;
for ( ; ; S++) {
if (*S == Char) {
return S;
}
if (*S == '\0') {
return NULL;
}
}
}
char *
strrchr (
const char *Str, const char *Str,
int Char int Char
) )
@ -71,7 +50,7 @@ __isspace (
} }
unsigned long unsigned long
strtoul ( fdt_strtoul (
const char *Nptr, const char *Nptr,
char **EndPtr, char **EndPtr,
int Base int Base