sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MdeModulePkg: Apply uncrustify changes

Browse Source 
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3737

Apply uncrustify changes to .c/.h files in the MdeModulePkg package

Cc: Andrew Fish <afish@apple.com>
Cc: Leif Lindholm <leif@nuviainc.com>
Cc: Michael D Kinney <michael.d.kinney@intel.com>
Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
This commit is contained in:
Michael Kubacki
2021-12-05 14:54:02 -08:00
committed by mergify[bot]
parent 7c7184e201
commit 1436aea4d5
994 changed files with 107608 additions and 101311 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.c
View File

@@ -9,19 +9,25 @@
**/
#include "OnigurumaUefiPort.h"
#define ONIGMEM_HEAD_SIGNATURE SIGNATURE_32('o','m','h','d')
#define ONIGMEM_HEAD_SIGNATURE SIGNATURE_32('o','m','h','d')
typedef struct {
UINT32 Signature;
UINTN Size;
} ONIGMEM_HEAD;
#define ONIGMEM_OVERHEAD sizeof(ONIGMEM_HEAD)
#define ONIGMEM_OVERHEAD sizeof(ONIGMEM_HEAD)
int EFIAPI sprintf_s(char *str, size_t sizeOfBuffer, char const *fmt, ...)
int EFIAPI
sprintf_s (
char *str,
size_t sizeOfBuffer,
char const *fmt,
...
)
{
VA_LIST Marker;
int NumberOfPrinted;
VA_LIST Marker;
int NumberOfPrinted;
VA_START (Marker, fmt);
NumberOfPrinted = (int)AsciiVSPrint (str, sizeOfBuffer, fmt, Marker);
@@ -30,47 +36,62 @@ int EFIAPI sprintf_s(char *str, size_t sizeOfBuffer, char const *fmt, ...)
return NumberOfPrinted;
}
int OnigStrCmp (const char* Str1, const char* Str2)
int
OnigStrCmp (
const char *Str1,
const char *Str2
)
{
return (int)AsciiStrCmp (Str1, Str2);
}
int strlen(const char* str)
int
strlen (
const char *str
)
{
return strlen_s(str, MAX_STRING_SIZE);
return strlen_s (str, MAX_STRING_SIZE);
}
void * malloc (size_t size)
void *
malloc (
size_t size
)
{
ONIGMEM_HEAD *PoolHdr;
UINTN NewSize;
VOID *Data;
UINTN NewSize;
VOID *Data;
NewSize = (UINTN)(size) + ONIGMEM_OVERHEAD;
Data = AllocatePool (NewSize);
Data = AllocatePool (NewSize);
if (Data != NULL) {
PoolHdr = (ONIGMEM_HEAD *)Data;
PoolHdr = (ONIGMEM_HEAD *)Data;
PoolHdr->Signature = ONIGMEM_HEAD_SIGNATURE;
PoolHdr->Size = size;
return (VOID *)(PoolHdr + 1);
}
return NULL;
}
void * realloc (void *ptr, size_t size)
void *
realloc (
void *ptr,
size_t size
)
{
ONIGMEM_HEAD *OldPoolHdr;
ONIGMEM_HEAD *NewPoolHdr;
UINTN OldSize;
UINTN NewSize;
VOID *Data;
UINTN OldSize;
UINTN NewSize;
VOID *Data;
NewSize = (UINTN)size + ONIGMEM_OVERHEAD;
Data = AllocatePool (NewSize);
Data = AllocatePool (NewSize);
if (Data != NULL) {
NewPoolHdr = (ONIGMEM_HEAD *)Data;
NewPoolHdr = (ONIGMEM_HEAD *)Data;
NewPoolHdr->Signature = ONIGMEM_HEAD_SIGNATURE;
NewPoolHdr->Size = size;
if (ptr != NULL) {
@@ -81,25 +102,40 @@ void * realloc (void *ptr, size_t size)
CopyMem ((VOID *)(NewPoolHdr + 1), ptr, MIN (OldSize, size));
FreePool ((VOID *)OldPoolHdr);
}
return (VOID *)(NewPoolHdr + 1);
}
return NULL;
}
void* memcpy (void *dest, const void *src, unsigned int count)
void *
memcpy (
void *dest,
const void *src,
unsigned int count
)
{
return CopyMem (dest, src, (UINTN)count);
}
void* memset (void *dest, char ch, unsigned int count)
void *
memset (
void *dest,
char ch,
unsigned int count
)
{
return SetMem (dest, count, ch);
}
void free(void *ptr)
void
free (
void *ptr
)
{
VOID *EvalOnce;
ONIGMEM_HEAD *PoolHdr;
VOID *EvalOnce;
ONIGMEM_HEAD *PoolHdr;
EvalOnce = ptr;
if (EvalOnce == NULL) {

140
MdeModulePkg/Universal/RegularExpressionDxe/OnigurumaUefiPort.h
View File

@@ -7,6 +7,7 @@
SPDX-License-Identifier: BSD-2-Clause-Patent
**/
#ifndef ONIGURUMA_UEFI_PORT_H
#define ONIGURUMA_UEFI_PORT_H
@@ -16,79 +17,116 @@
#include <Library/BaseLib.h>
#include <Library/DebugLib.h>
#define ONIG_NO_STANDARD_C_HEADERS
#define ONIG_NO_PRINT
#define P_(args) args
#define P_(args) args
#define INT_MAX 0x7FFFFFFF
#define LONG_MAX 0x7FFFFFFF
#define UINT_MAX 0xFFFFFFFF
#define ULONG_MAX 0xFFFFFFFF
#define INT_MAX 0x7FFFFFFF
#define LONG_MAX 0x7FFFFFFF
#define UINT_MAX 0xFFFFFFFF
#define ULONG_MAX 0xFFFFFFFF
#define SIZEOF_LONG 4
#define SIZEOF_LONG_LONG 8
typedef UINTN size_t;
typedef UINT32 uint32_t;
typedef INTN intptr_t;
#define SIZEOF_LONG 4
#define SIZEOF_LONG_LONG 8
typedef UINTN size_t;
typedef UINT32 uint32_t;
typedef INTN intptr_t;
#ifndef offsetof
#define offsetof OFFSET_OF
#define offsetof OFFSET_OF
#endif
#ifdef MDE_CPU_IA32
#define SIZEOF_VOIDP 4
#define SIZEOF_VOIDP 4
#endif
#ifdef MDE_CPU_X64
#define SIZEOF_VOIDP 8
#define SIZEOF_VOIDP 8
#endif
#define calloc(n,s) AllocateZeroPool((n)*(s))
#define xmemmove(Dest,Src,Length) CopyMem(Dest,Src,Length)
#define xmemcpy(Dest,Src,Length) CopyMem(Dest,Src,Length)
#define xmemset(Buffer,Value,Length) SetMem(Buffer,Length,Value)
#define calloc(n, s) AllocateZeroPool((n)*(s))
#define xmemmove(Dest, Src, Length) CopyMem(Dest,Src,Length)
#define xmemcpy(Dest, Src, Length) CopyMem(Dest,Src,Length)
#define xmemset(Buffer, Value, Length) SetMem(Buffer,Length,Value)
#define va_init_list(a,b) VA_START(a,b)
#define va_list VA_LIST
#define va_arg(a,b) VA_ARG(a,b)
#define va_end(a) VA_END(a)
#define va_start VA_START
#define va_init_list(a, b) VA_START(a,b)
#define va_list VA_LIST
#define va_arg(a, b) VA_ARG(a,b)
#define va_end(a) VA_END(a)
#define va_start VA_START
#define FILE VOID
#define stdout NULL
#define FILE VOID
#define stdout NULL
#define fprintf(...)
#define fputs(a,b)
#define vsnprintf (int)AsciiVSPrint
#define _vsnprintf vsnprintf
#define xsnprintf sprintf_s
#define fputs(a, b)
#define vsnprintf (int)AsciiVSPrint
#define _vsnprintf vsnprintf
#define xsnprintf sprintf_s
#define xvsnprintf vsnprintf
#define alloca malloc
#define alloca malloc
#define setlocale(a,b)
#define LC_ALL 0
#define setlocale(a, b)
#define LC_ALL 0
#define UCHAR_MAX 255
#define MAX_STRING_SIZE 0x1000
#define strlen_s(String,MaxSize) AsciiStrnLenS (String, MaxSize)
#define xstrncpy(Dest, Src, MaxSize) strcat_s(Dest,MaxSize,Src)
#define xstrcat(Dest,Src,MaxSize) strcat(Dest,Src,MaxSize)
#define strcat(Dest,Src,MaxSize) strcat_s(Dest,MaxSize,Src)
#define strcat_s(Dest,MaxSize,Src) AsciiStrCatS (Dest, MaxSize, Src)
#define strncpy_s(Dest,MaxSize,Src,Length) AsciiStrnCpyS (Dest, MaxSize, Src, Length)
#define strcmp OnigStrCmp
#define UCHAR_MAX 255
#define MAX_STRING_SIZE 0x1000
#define strlen_s(String, MaxSize) AsciiStrnLenS (String, MaxSize)
#define xstrncpy(Dest, Src, MaxSize) strcat_s(Dest,MaxSize,Src)
#define xstrcat(Dest, Src, MaxSize) strcat(Dest,Src,MaxSize)
#define strcat(Dest, Src, MaxSize) strcat_s(Dest,MaxSize,Src)
#define strcat_s(Dest, MaxSize, Src) AsciiStrCatS (Dest, MaxSize, Src)
#define strncpy_s(Dest, MaxSize, Src, Length) AsciiStrnCpyS (Dest, MaxSize, Src, Length)
#define strcmp OnigStrCmp
int OnigStrCmp (const char* Str1, const char* Str2);
int
OnigStrCmp (
const char *Str1,
const char *Str2
);
int EFIAPI sprintf_s (char *str, size_t sizeOfBuffer, char const *fmt, ...);
int strlen(const char* str);
void* malloc(size_t size);
void* realloc(void *ptr, size_t size);
void* memcpy (void *dest, const void *src, unsigned int count);
void* memset (void *dest, char ch, unsigned int count);
void free(void *ptr);
int EFIAPI
sprintf_s (
char *str,
size_t sizeOfBuffer,
char const *fmt,
...
);
#define exit(n) ASSERT(FALSE);
int
strlen (
const char *str
);
void *
malloc (
size_t size
);
void *
realloc (
void *ptr,
size_t size
);
void *
memcpy (
void *dest,
const void *src,
unsigned int count
);
void *
memset (
void *dest,
char ch,
unsigned int count
);
void
free (
void *ptr
);
#define exit(n) ASSERT(FALSE);
#endif // !ONIGURUMA_UEFI_PORT_H

73
MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.c
View File

@@ -11,20 +11,18 @@
#include "RegularExpressionDxe.h"
STATIC
EFI_REGEX_SYNTAX_TYPE * CONST mSupportedSyntaxes[] = {
EFI_REGEX_SYNTAX_TYPE *CONST mSupportedSyntaxes[] = {
&gEfiRegexSyntaxTypePosixExtendedGuid,
&gEfiRegexSyntaxTypePerlGuid
};
STATIC
EFI_REGULAR_EXPRESSION_PROTOCOL mProtocolInstance = {
EFI_REGULAR_EXPRESSION_PROTOCOL mProtocolInstance = {
RegularExpressionMatch,
RegularExpressionGetInfo
};
#define CHAR16_ENCODING ONIG_ENCODING_UTF16_LE
#define CHAR16_ENCODING ONIG_ENCODING_UTF16_LE
/**
Call the Oniguruma regex match API.
@@ -69,12 +67,12 @@ EFI_REGULAR_EXPRESSION_PROTOCOL mProtocolInstance = {
STATIC
EFI_STATUS
OnigurumaMatch (
IN CHAR16 *String,
IN CHAR16 *Pattern,
IN EFI_REGEX_SYNTAX_TYPE *SyntaxType,
OUT BOOLEAN *Result,
OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,
OUT UINTN *CapturesCount
IN CHAR16 *String,
IN CHAR16 *Pattern,
IN EFI_REGEX_SYNTAX_TYPE *SyntaxType,
OUT BOOLEAN *Result,
OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,
OUT UINTN *CapturesCount
)
{
regex_t *OnigRegex;
@@ -87,7 +85,6 @@ OnigurumaMatch (
OnigUChar *Start;
EFI_STATUS Status;
Status = EFI_SUCCESS;
//
@@ -106,7 +103,7 @@ OnigurumaMatch (
//
// Compile pattern
//
Start = (OnigUChar*)Pattern;
Start = (OnigUChar *)Pattern;
OnigResult = onig_new (
&OnigRegex,
Start,
@@ -126,12 +123,13 @@ OnigurumaMatch (
//
// Try to match
//
Start = (OnigUChar*)String;
Start = (OnigUChar *)String;
Region = onig_region_new ();
if (Region == NULL) {
onig_free (OnigRegex);
return EFI_OUT_OF_RESOURCES;
}
OnigResult = onig_search (
OnigRegex,
Start,
@@ -158,18 +156,18 @@ OnigurumaMatch (
//
// If successful, copy out the region (capture) information
//
if (*Result && Captures != NULL) {
if (*Result && (Captures != NULL)) {
*CapturesCount = Region->num_regs;
*Captures = AllocateZeroPool (*CapturesCount * sizeof(**Captures));
*Captures = AllocateZeroPool (*CapturesCount * sizeof (**Captures));
if (*Captures != NULL) {
for (Index = 0; Index < *CapturesCount; ++Index) {
//
// Region beg/end values represent bytes, not characters
//
(*Captures)[Index].Length = (Region->end[Index] - Region->beg[Index]) / sizeof(CHAR16);
(*Captures)[Index].Length = (Region->end[Index] - Region->beg[Index]) / sizeof (CHAR16);
(*Captures)[Index].CapturePtr = AllocateCopyPool (
((*Captures)[Index].Length) * sizeof (CHAR16),
(CHAR16*)((UINTN)String + Region->beg[Index])
(CHAR16 *)((UINTN)String + Region->beg[Index])
);
if ((*Captures)[Index].CapturePtr == NULL) {
Status = EFI_OUT_OF_RESOURCES;
@@ -180,9 +178,10 @@ OnigurumaMatch (
if (EFI_ERROR (Status)) {
for (Index = 0; Index < *CapturesCount; ++Index) {
if ((*Captures)[Index].CapturePtr != NULL) {
FreePool ((CHAR16*)(*Captures)[Index].CapturePtr);
FreePool ((CHAR16 *)(*Captures)[Index].CapturePtr);
}
}
FreePool (*Captures);
}
}
@@ -229,23 +228,23 @@ OnigurumaMatch (
EFI_STATUS
EFIAPI
RegularExpressionGetInfo (
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN OUT UINTN *RegExSyntaxTypeListSize,
OUT EFI_REGEX_SYNTAX_TYPE *RegExSyntaxTypeList
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN OUT UINTN *RegExSyntaxTypeListSize,
OUT EFI_REGEX_SYNTAX_TYPE *RegExSyntaxTypeList
)
{
UINTN SyntaxSize;
UINTN Index;
UINTN SyntaxSize;
UINTN Index;
if (This == NULL || RegExSyntaxTypeListSize == NULL) {
if ((This == NULL) || (RegExSyntaxTypeListSize == NULL)) {
return EFI_INVALID_PARAMETER;
}
if (*RegExSyntaxTypeListSize != 0 && RegExSyntaxTypeList == NULL) {
if ((*RegExSyntaxTypeListSize != 0) && (RegExSyntaxTypeList == NULL)) {
return EFI_INVALID_PARAMETER;
}
SyntaxSize = ARRAY_SIZE (mSupportedSyntaxes) * sizeof(**mSupportedSyntaxes);
SyntaxSize = ARRAY_SIZE (mSupportedSyntaxes) * sizeof (**mSupportedSyntaxes);
if (*RegExSyntaxTypeListSize < SyntaxSize) {
*RegExSyntaxTypeListSize = SyntaxSize;
@@ -253,8 +252,9 @@ RegularExpressionGetInfo (
}
for (Index = 0; Index < ARRAY_SIZE (mSupportedSyntaxes); ++Index) {
CopyMem (&RegExSyntaxTypeList[Index], mSupportedSyntaxes[Index], sizeof(**mSupportedSyntaxes));
CopyMem (&RegExSyntaxTypeList[Index], mSupportedSyntaxes[Index], sizeof (**mSupportedSyntaxes));
}
*RegExSyntaxTypeListSize = SyntaxSize;
return EFI_SUCCESS;
@@ -312,20 +312,20 @@ RegularExpressionGetInfo (
EFI_STATUS
EFIAPI
RegularExpressionMatch (
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern,
IN EFI_REGEX_SYNTAX_TYPE *SyntaxType OPTIONAL,
OUT BOOLEAN *Result,
OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,
OUT UINTN *CapturesCount
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern,
IN EFI_REGEX_SYNTAX_TYPE *SyntaxType OPTIONAL,
OUT BOOLEAN *Result,
OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,
OUT UINTN *CapturesCount
)
{
EFI_STATUS Status;
UINT32 Index;
BOOLEAN Supported;
if (This == NULL || String == NULL || Pattern == NULL || Result == NULL || CapturesCount == NULL) {
if ((This == NULL) || (String == NULL) || (Pattern == NULL) || (Result == NULL) || (CapturesCount == NULL)) {
return EFI_INVALID_PARAMETER;
}
@@ -342,6 +342,7 @@ RegularExpressionMatch (
break;
}
}
if (!Supported) {
return EFI_UNSUPPORTED;
}

20
MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.h
View File

@@ -73,13 +73,13 @@
EFI_STATUS
EFIAPI
RegularExpressionMatch (
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern,
IN EFI_REGEX_SYNTAX_TYPE *SyntaxType OPTIONAL,
OUT BOOLEAN *Result,
OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,
OUT UINTN *CapturesCount
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN CHAR16 *String,
IN CHAR16 *Pattern,
IN EFI_REGEX_SYNTAX_TYPE *SyntaxType OPTIONAL,
OUT BOOLEAN *Result,
OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,
OUT UINTN *CapturesCount
);
/**
@@ -117,9 +117,9 @@ RegularExpressionMatch (
EFI_STATUS
EFIAPI
RegularExpressionGetInfo (
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN OUT UINTN *RegExSyntaxTypeListSize,
OUT EFI_REGEX_SYNTAX_TYPE *RegExSyntaxTypeList
IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,
IN OUT UINTN *RegExSyntaxTypeListSize,
OUT EFI_REGEX_SYNTAX_TYPE *RegExSyntaxTypeList
);
#endif