From 8122c6bc8b6f1fde31f2af6c1560ec552204980d Mon Sep 17 00:00:00 2001 From: "Guo, Dongao" Date: Mon, 8 Oct 2018 15:56:48 +0800 Subject: [PATCH] MdeModulePkg/RegularExpressionDxe:omit unused variable comment unused variable to avoid warning,and modify inf build option. Cc: Liming Gao Contributed-under: TianoCore Contribution Agreement 1.1 Signed-off-by: Dongao Guo Reviewed-by: Liming Gao --- .../RegularExpressionDxe/Oniguruma/regexec.c | 28 +++++++++---------- .../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 7b0fda07f8..26e7a3176c 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.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf index 07bc02e097..da50092cd2 100644 --- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf +++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf @@ -107,8 +107,5 @@ # 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 - # Oniguruma: tag_end in parse_callout_of_name GCC:*_*_*_CC_FLAGS = -Wno-error=maybe-uninitialized