#include "RegularExpressionDxe.h"\r
\r
STATIC\r
-EFI_REGEX_SYNTAX_TYPE * CONST mSupportedSyntaxes[] = {\r
+EFI_REGEX_SYNTAX_TYPE *CONST mSupportedSyntaxes[] = {\r
&gEfiRegexSyntaxTypePosixExtendedGuid,\r
&gEfiRegexSyntaxTypePerlGuid\r
};\r
\r
STATIC\r
-EFI_REGULAR_EXPRESSION_PROTOCOL mProtocolInstance = {\r
+EFI_REGULAR_EXPRESSION_PROTOCOL mProtocolInstance = {\r
RegularExpressionMatch,\r
RegularExpressionGetInfo\r
};\r
\r
-\r
-\r
-#define CHAR16_ENCODING ONIG_ENCODING_UTF16_LE\r
+#define CHAR16_ENCODING ONIG_ENCODING_UTF16_LE\r
\r
/**\r
Call the Oniguruma regex match API.\r
STATIC\r
EFI_STATUS\r
OnigurumaMatch (\r
- IN CHAR16 *String,\r
- IN CHAR16 *Pattern,\r
- IN EFI_REGEX_SYNTAX_TYPE *SyntaxType,\r
- OUT BOOLEAN *Result,\r
- OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,\r
- OUT UINTN *CapturesCount\r
+ IN CHAR16 *String,\r
+ IN CHAR16 *Pattern,\r
+ IN EFI_REGEX_SYNTAX_TYPE *SyntaxType,\r
+ OUT BOOLEAN *Result,\r
+ OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,\r
+ OUT UINTN *CapturesCount\r
)\r
{\r
regex_t *OnigRegex;\r
OnigUChar *Start;\r
EFI_STATUS Status;\r
\r
-\r
Status = EFI_SUCCESS;\r
\r
//\r
//\r
// Compile pattern\r
//\r
- Start = (OnigUChar*)Pattern;\r
+ Start = (OnigUChar *)Pattern;\r
OnigResult = onig_new (\r
&OnigRegex,\r
Start,\r
//\r
// Try to match\r
//\r
- Start = (OnigUChar*)String;\r
+ Start = (OnigUChar *)String;\r
Region = onig_region_new ();\r
if (Region == NULL) {\r
onig_free (OnigRegex);\r
return EFI_OUT_OF_RESOURCES;\r
}\r
+\r
OnigResult = onig_search (\r
OnigRegex,\r
Start,\r
//\r
// If successful, copy out the region (capture) information\r
//\r
- if (*Result && Captures != NULL) {\r
+ if (*Result && (Captures != NULL)) {\r
*CapturesCount = Region->num_regs;\r
- *Captures = AllocateZeroPool (*CapturesCount * sizeof(**Captures));\r
+ *Captures = AllocateZeroPool (*CapturesCount * sizeof (**Captures));\r
if (*Captures != NULL) {\r
for (Index = 0; Index < *CapturesCount; ++Index) {\r
//\r
// Region beg/end values represent bytes, not characters\r
//\r
- (*Captures)[Index].Length = (Region->end[Index] - Region->beg[Index]) / sizeof(CHAR16);\r
+ (*Captures)[Index].Length = (Region->end[Index] - Region->beg[Index]) / sizeof (CHAR16);\r
(*Captures)[Index].CapturePtr = AllocateCopyPool (\r
((*Captures)[Index].Length) * sizeof (CHAR16),\r
- (CHAR16*)((UINTN)String + Region->beg[Index])\r
+ (CHAR16 *)((UINTN)String + Region->beg[Index])\r
);\r
if ((*Captures)[Index].CapturePtr == NULL) {\r
Status = EFI_OUT_OF_RESOURCES;\r
if (EFI_ERROR (Status)) {\r
for (Index = 0; Index < *CapturesCount; ++Index) {\r
if ((*Captures)[Index].CapturePtr != NULL) {\r
- FreePool ((CHAR16*)(*Captures)[Index].CapturePtr);\r
+ FreePool ((CHAR16 *)(*Captures)[Index].CapturePtr);\r
}\r
}\r
+\r
FreePool (*Captures);\r
}\r
}\r
EFI_STATUS\r
EFIAPI\r
RegularExpressionGetInfo (\r
- IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,\r
- IN OUT UINTN *RegExSyntaxTypeListSize,\r
- OUT EFI_REGEX_SYNTAX_TYPE *RegExSyntaxTypeList\r
+ IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,\r
+ IN OUT UINTN *RegExSyntaxTypeListSize,\r
+ OUT EFI_REGEX_SYNTAX_TYPE *RegExSyntaxTypeList\r
)\r
{\r
- UINTN SyntaxSize;\r
- UINTN Index;\r
+ UINTN SyntaxSize;\r
+ UINTN Index;\r
\r
- if (This == NULL || RegExSyntaxTypeListSize == NULL) {\r
+ if ((This == NULL) || (RegExSyntaxTypeListSize == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- if (*RegExSyntaxTypeListSize != 0 && RegExSyntaxTypeList == NULL) {\r
+ if ((*RegExSyntaxTypeListSize != 0) && (RegExSyntaxTypeList == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
- SyntaxSize = ARRAY_SIZE (mSupportedSyntaxes) * sizeof(**mSupportedSyntaxes);\r
+ SyntaxSize = ARRAY_SIZE (mSupportedSyntaxes) * sizeof (**mSupportedSyntaxes);\r
\r
if (*RegExSyntaxTypeListSize < SyntaxSize) {\r
*RegExSyntaxTypeListSize = SyntaxSize;\r
}\r
\r
for (Index = 0; Index < ARRAY_SIZE (mSupportedSyntaxes); ++Index) {\r
- CopyMem (&RegExSyntaxTypeList[Index], mSupportedSyntaxes[Index], sizeof(**mSupportedSyntaxes));\r
+ CopyMem (&RegExSyntaxTypeList[Index], mSupportedSyntaxes[Index], sizeof (**mSupportedSyntaxes));\r
}\r
+\r
*RegExSyntaxTypeListSize = SyntaxSize;\r
\r
return EFI_SUCCESS;\r
EFI_STATUS\r
EFIAPI\r
RegularExpressionMatch (\r
- IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,\r
- IN CHAR16 *String,\r
- IN CHAR16 *Pattern,\r
- IN EFI_REGEX_SYNTAX_TYPE *SyntaxType OPTIONAL,\r
- OUT BOOLEAN *Result,\r
- OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,\r
- OUT UINTN *CapturesCount\r
+ IN EFI_REGULAR_EXPRESSION_PROTOCOL *This,\r
+ IN CHAR16 *String,\r
+ IN CHAR16 *Pattern,\r
+ IN EFI_REGEX_SYNTAX_TYPE *SyntaxType OPTIONAL,\r
+ OUT BOOLEAN *Result,\r
+ OUT EFI_REGEX_CAPTURE **Captures OPTIONAL,\r
+ OUT UINTN *CapturesCount\r
)\r
{\r
EFI_STATUS Status;\r
UINT32 Index;\r
BOOLEAN Supported;\r
\r
- if (This == NULL || String == NULL || Pattern == NULL || Result == NULL || CapturesCount == NULL) {\r
+ if ((This == NULL) || (String == NULL) || (Pattern == NULL) || (Result == NULL) || (CapturesCount == NULL)) {\r
return EFI_INVALID_PARAMETER;\r
}\r
\r
break;\r
}\r
}\r
+\r
if (!Supported) {\r
return EFI_UNSUPPORTED;\r
}\r