From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id A1CB11A1E30 for ; Wed, 12 Oct 2016 01:09:20 -0700 (PDT) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga105.jf.intel.com with ESMTP; 12 Oct 2016 01:09:20 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,333,1473145200"; d="scan'208";a="889186569" Received: from fmsmsx108.amr.corp.intel.com ([10.18.124.206]) by orsmga003.jf.intel.com with ESMTP; 12 Oct 2016 01:09:20 -0700 Received: from fmsmsx114.amr.corp.intel.com (10.18.116.8) by FMSMSX108.amr.corp.intel.com (10.18.124.206) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 12 Oct 2016 01:09:19 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by FMSMSX114.amr.corp.intel.com (10.18.116.8) with Microsoft SMTP Server (TLS) id 14.3.248.2; Wed, 12 Oct 2016 01:09:19 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.104]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.96]) with mapi id 14.03.0248.002; Wed, 12 Oct 2016 16:09:16 +0800 From: "Tian, Feng" To: "Gao, Liming" , "edk2-devel@lists.01.org" CC: Cecil Sheng , "Tian, Feng" Thread-Topic: [edk2] [Patch] MdeModulePkg RegularExpressionDxe: Add the missing EFIAPI for the function Thread-Index: AQHSIdX6V6VQdugikEeKfJB/xCnS8aCkfCFg Date: Wed, 12 Oct 2016 08:09:16 +0000 Message-ID: <7F1BAD85ADEA444D97065A60D2E97EE566E31719@SHSMSX101.ccr.corp.intel.com> References: <1475980586-5404-1-git-send-email-liming.gao@intel.com> In-Reply-To: <1475980586-5404-1-git-send-email-liming.gao@intel.com> Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch] MdeModulePkg RegularExpressionDxe: Add the missing EFIAPI for the function X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Oct 2016 08:09:20 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Feng Tian Thanks Feng -----Original Message----- From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of Limi= ng Gao Sent: Sunday, October 9, 2016 10:36 AM To: edk2-devel@lists.01.org Cc: Tian, Feng ; Cecil Sheng Subject: [edk2] [Patch] MdeModulePkg RegularExpressionDxe: Add the missing = EFIAPI for the function The function with the variable parameters should have EFIAPI. Cc: Feng Tian Cc: Cinnamon Shia Cc: Cecil Sheng Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- .../Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.c | = 2 +- .../Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPort.h | = 2 +- MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h | = 2 +- MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c | = 2 ++ MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h | = 2 +- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/Onigurum= aUefiPort.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/Oniguru= maUefiPort.c index aaa5d3d..b4a9adf 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPo= rt.c +++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUef +++ iPort.c @@ -14,7 +14,7 @@ **/ #include "OnigurumaUefiPort.h" =20 -int sprintf_s(char *str, size_t sizeOfBuffer, char const *fmt, ...) +int EFIAPI sprintf_s(char *str, size_t sizeOfBuffer, char const *fmt,=20 +...) { VA_LIST Marker; int NumberOfPrinted; diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/Onigurum= aUefiPort.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/Oniguru= maUefiPort.h index ca478de..d24ac1d 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUefiPo= rt.h +++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/OnigurumaUef +++ iPort.h @@ -69,7 +69,7 @@ typedef UINTN size_t; =20 int OnigStrCmp (char* Str1, char* Str2); =20 -int sprintf_s (char *str, size_t sizeOfBuffer, char const *fmt, ...); +int EFIAPI sprintf_s (char *str, size_t sizeOfBuffer, char const *fmt,=20 +...); =20 #define exit(n) ASSERT(FALSE); =20 diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/onigurum= a.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h index 034a2cc..462565a 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h +++ b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/oniguruma.h @@ -719,7 +719,7 @@ typedef struct { ONIG_EXTERN int onig_init P_((void)); ONIG_EXTERN -int onig_error_code_to_str PV_((OnigUChar* s, int err_code, ...)); +int EFIAPI onig_error_code_to_str PV_((OnigUChar* s, int err_code,=20 +...)); ONIG_EXTERN void onig_set_warn_func P_((OnigWarnFunc f)); ONIG_EXTERN diff --git a/Md= eModulePkg/Universal/RegularExpressionDxe/Oniguruma/regerror.c b/MdeModuleP= kg/Universal/RegularExpressionDxe/Oniguruma/regerror.c index fbc764a..1544e23 100644 --- 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 =20 extern int +EFIAPI #ifdef HAVE_STDARG_PROTOTYPES onig_error_code_to_str(UChar* s, int code, ...) #else @@ -324,6 +325,7 @@= onig_error_code_to_str(s, code, va_alist) =20 =20 void +EFIAPI #ifdef HAVE_STDARG_PROTOTYPES onig_snprintf_with_pattern(UChar buf[], int bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar *fmt, .= ..) diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regi= nt.h b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regint.h index f48c557..d5b3089 100644 --- 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)); #endi= f =20 extern UChar* onig_error_code_to_format P_((int code)); -extern void onig= _snprintf_with_pattern PV_((UChar buf[], int bufsize, OnigEncoding enc, UCh= ar* pat, UChar* pat_end, const UChar *fmt, ...)); +extern void EFIAPI onig_snprintf_with_pattern PV_((UChar buf[], int=20 +bufsize, OnigEncoding enc, UChar* pat, UChar* pat_end, const UChar=20 +*fmt, ...)); extern int onig_bbuf_init P_((BBuf* buf, int size)); extern int onig_co= mpile P_((regex_t* reg, const UChar* pattern, const UChar* pattern_end, Oni= gErrorInfo* einfo)); extern void onig_chain_reduce P_((regex_t* reg)); -- 2.8.0.windows.1 _______________________________________________ edk2-devel mailing list edk2-devel@lists.01.org https://lists.01.org/mailman/listinfo/edk2-devel