MdeModulePkg RegularExpressionDxe: Add the missing EFIAPI for the function

The function with the variable parameters should have EFIAPI.

Cc: Feng Tian <feng.tian@intel.com>
Cc: Cinnamon Shia <cinnamon.shia@hpe.com>
Cc: Cecil Sheng <cecil.sheng@hpe.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Feng Tian <feng.tian@intel.com>

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c
index aaa5d3dc74a8e96737d98e6dc091dff33167c35a..b4a9adfefa1e8e74c252175e369a67885d10d4a7 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c
@@ -14,7 +14,7 @@
 **/\r
 #include "OnigurumaUefiPort.h"\r
 \r
-int sprintf_s(char *str, size_t sizeOfBuffer, char const *fmt, ...)\r
+int EFIAPI sprintf_s(char *str, size_t sizeOfBuffer, char const *fmt, ...)\r
 {\r
   VA_LIST Marker;\r
   int   NumberOfPrinted;\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h
index ca478de68e772c2bd074231569a8b5bdf20a2b19..d24ac1d880b04c19462bce20e41edd4d71993c58 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h
@@ -69,7 +69,7 @@ typedef UINTN size_t;
 \r
 int OnigStrCmp (char* Str1, char* Str2);\r
 \r
-int sprintf_s (char *str, size_t sizeOfBuffer, char const *fmt, ...);\r
+int EFIAPI sprintf_s (char *str, size_t sizeOfBuffer, char const *fmt, ...);\r
 \r
 #define exit(n) ASSERT(FALSE);\r
 \r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
index 034a2ccff123ad010fc164d3c0577cb2198c09b7..462565aeca1389f3380fdbd158a3e47850d4ccde 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h
@@ -719,7 +719,7 @@ typedef struct {
 ONIG_EXTERN\r
 int onig_init P_((void));\r
 ONIG_EXTERN\r
-int onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...));\r
+int EFIAPI onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...));\r
 ONIG_EXTERN\r
 void onig_set_warn_func P_((OnigWarnFunc f));\r
 ONIG_EXTERN\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c
index fbc764aa426695bb8189574c611ab1e4ba4c019a..1544e23f103711a4d309fdce39a8463ba7bb8ca6 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c
@@ -252,6 +252,7 @@ static int to_ascii(OnigEncoding enc, UChar *s, UChar *end,
 #define MAX_ERROR_PAR_LEN   30\r
 \r
 extern int\r
+EFIAPI\r
 #ifdef HAVE_STDARG_PROTOTYPES\r
 onig_error_code_to_str(UChar* s, int code, ...)\r
 #else\r
@@ -324,6 +325,7 @@ onig_error_code_to_str(s, code, va_alist)
 \r
 \r
 void\r
+EFIAPI\r
 #ifdef HAVE_STDARG_PROTOTYPES\r
 onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc,\r
                            UChar* pat, UChar* pat_end, const UChar *fmt, ...)\r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
index f48c55764c32c822c08ee5f9bd11ae3f35f107c1..d5b30898a36893fff1997684c19c841bb3b5db36 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h
@@ -781,7 +781,7 @@ extern void onig_print_statistics P_((FILE* f));
 #endif\r
 \r
 extern UChar* onig_error_code_to_format P_((int code));\r
-extern void  onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...));\r
+extern void EFIAPI onig_snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, ...));\r
 extern int  onig_bbuf_init P_((BBuf* buf, int size));\r
 extern int  onig_compile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, OnigErrorInfo* einfo));\r
 extern void onig_chain_reduce P_((regex_t* reg));\r