From: "Gao, Liming" <liming.gao@intel.com>
To: "Guo, Dongao" <dongao.guo@intel.com>,
"edk2-devel@lists.01.org" <edk2-devel@lists.01.org>
Subject: Re: [PATCH] MdeModulePkg/RegularExpressionDxe:omit unused variable
Date: Wed, 10 Oct 2018 00:55:52 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E3361F2@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <1538985408-16028-1-git-send-email-dongao.guo@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
>-----Original Message-----
>From: Guo, Dongao
>Sent: Monday, October 08, 2018 3:57 PM
>To: edk2-devel@lists.01.org
>Cc: Gao, Liming <liming.gao@intel.com>
>Subject: [PATCH] MdeModulePkg/RegularExpressionDxe:omit unused
>variable
>
>
>comment unused variable to avoid warning,and modify inf build option.
>
>Cc: Liming Gao <liming.gao@intel.com>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Dongao Guo <dongao.guo@intel.com>
>---
> .../RegularExpressionDxe/Oniguruma/regexec.c | 28 +++++++++++--------
>---
> .../RegularExpressionDxe/RegularExpressionDxe.inf | 3 ---
> 2 files changed, 14 insertions(+), 17 deletions(-)
>
>diff --git
>a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
>b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
>index 7b0fda0..26e7a31 100644
>--- a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
>+++
>b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
>@@ -5603,11 +5603,11 @@ onig_builtin_monitor(OnigCalloutArgs* args,
>void* user_data)
> int r;
> int num;
> size_t tag_len;
>- const UChar* start;
>- const UChar* right;
>- const UChar* current;
>- const UChar* string;
>- const UChar* strend;
>+ // const UChar* start;
>+ // const UChar* right;
>+ // const UChar* current;
>+ // const UChar* string;
>+ // const UChar* strend;
> const UChar* tag_start;
> const UChar* tag_end;
> regex_t* reg;
>@@ -5615,9 +5615,9 @@ onig_builtin_monitor(OnigCalloutArgs* args, void*
>user_data)
> OnigType type;
> OnigValue val;
> char buf[20];
>- FILE* fp;
>+ // FILE* fp;
>
>- fp = OutFp;
>+ // fp = OutFp;
>
> r = onig_get_arg_by_callout_args(args, 0, &type, &val);
> if (r != ONIG_NORMAL) return r;
>@@ -5633,11 +5633,11 @@ onig_builtin_monitor(OnigCalloutArgs* args,
>void* user_data)
> }
>
> num = onig_get_callout_num_by_callout_args(args);
>- start = onig_get_start_by_callout_args(args);
>- right = onig_get_right_range_by_callout_args(args);
>- current = onig_get_current_by_callout_args(args);
>- string = onig_get_string_by_callout_args(args);
>- strend = onig_get_string_end_by_callout_args(args);
>+ // start = onig_get_start_by_callout_args(args);
>+ // right = onig_get_right_range_by_callout_args(args);
>+ // current = onig_get_current_by_callout_args(args);
>+ // string = onig_get_string_by_callout_args(args);
>+ // strend = onig_get_string_end_by_callout_args(args);
> reg = onig_get_regex_by_callout_args(args);
> tag_start = onig_get_callout_tag_start(reg, num);
> tag_end = onig_get_callout_tag_end(reg, num);
>@@ -5653,7 +5653,7 @@ onig_builtin_monitor(OnigCalloutArgs* args, void*
>user_data)
> for (i = 0; i < tag_len; i++) buf[i] = tag_start[i];
> buf[tag_len] = '\0';
> }
>-
>+/*
> fprintf(fp, "ONIG-MONITOR: %-4s %s at: %d [%d - %d] len: %d\n",
> buf,
> in == ONIG_CALLOUT_IN_PROGRESS ? "=>" : "<=",
>@@ -5662,7 +5662,7 @@ onig_builtin_monitor(OnigCalloutArgs* args, void*
>user_data)
> (int )(right - string),
> (int )(strend - string));
> //fflush(fp);
>-
>+*/
> return ONIG_CALLOUT_SUCCESS;
> }
>
>diff --git
>a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.in
>f
>b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.in
>f
>index 16e91bd..98fb8db 100644
>---
>a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.in
>f
>+++
>b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.in
>f
>@@ -106,6 +106,3 @@
>
> # Oniguruma: signed and unsigned mismatch/cast
> MSFT:*_*_*_CC_FLAGS = /wd4018 /wd4245 /wd4389
>-
>- # Oniguruma: error: variable 'fp' set but not used
>- GCC:*_*_*_CC_FLAGS = -Wno-error=unused-but-set-variable
>--
>1.9.1
prev parent reply other threads:[~2018-10-10 0:58 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-08 7:56 [PATCH] MdeModulePkg/RegularExpressionDxe:omit unused variable Dongao Guo
2018-10-08 9:51 ` Gary Lin
2018-10-09 1:46 ` Guo, Dongao
2018-10-10 0:55 ` Gao, Liming [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E3361F2@SHSMSX104.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox