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>
Reviewed-by: Liming Gao <liming.gao@intel.com>

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c b/MdeModulePkg/Universal/RegularExpressionDxe/Oniguruma/regexec.c
index 7b0fda07f8966d0a43fc352b2f2fdc39a97286c1..26e7a3176cb4118132bfcadb3da504bb50c5b8a7 100644 (file)
--- 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;\r
   int num;\r
   size_t tag_len;\r
-  const UChar* start;\r
-  const UChar* right;\r
-  const UChar* current;\r
-  const UChar* string;\r
-  const UChar* strend;\r
+ // const UChar* start;\r
+ // const UChar* right;\r
+ // const UChar* current;\r
+ // const UChar* string;\r
+ // const UChar* strend;\r
   const UChar* tag_start;\r
   const UChar* tag_end;\r
   regex_t* reg;\r
@@ -5615,9 +5615,9 @@ onig_builtin_monitor(OnigCalloutArgs* args, void* user_data)
   OnigType type;\r
   OnigValue val;\r
   char buf[20];\r
-  FILE* fp;\r
+ // FILE* fp;\r
 \r
-  fp = OutFp;\r
+ // fp = OutFp;\r
 \r
   r = onig_get_arg_by_callout_args(args, 0, &type, &val);\r
   if (r != ONIG_NORMAL) return r;\r
@@ -5633,11 +5633,11 @@ onig_builtin_monitor(OnigCalloutArgs* args, void* user_data)
   }\r
 \r
   num       = onig_get_callout_num_by_callout_args(args);\r
-  start     = onig_get_start_by_callout_args(args);\r
-  right     = onig_get_right_range_by_callout_args(args);\r
-  current   = onig_get_current_by_callout_args(args);\r
-  string    = onig_get_string_by_callout_args(args);\r
-  strend    = onig_get_string_end_by_callout_args(args);\r
+ // start     = onig_get_start_by_callout_args(args);\r
+ // right     = onig_get_right_range_by_callout_args(args);\r
+ // current   = onig_get_current_by_callout_args(args);\r
+ // string    = onig_get_string_by_callout_args(args);\r
+ // strend    = onig_get_string_end_by_callout_args(args);\r
   reg       = onig_get_regex_by_callout_args(args);\r
   tag_start = onig_get_callout_tag_start(reg, num);\r
   tag_end   = onig_get_callout_tag_end(reg, num);\r
@@ -5653,7 +5653,7 @@ onig_builtin_monitor(OnigCalloutArgs* args, void* user_data)
     for (i = 0; i < tag_len; i++) buf[i] = tag_start[i];\r
     buf[tag_len] = '\0';\r
   }\r
-\r
+/*\r
   fprintf(fp, "ONIG-MONITOR: %-4s %s at: %d [%d - %d] len: %d\n",\r
           buf,\r
           in == ONIG_CALLOUT_IN_PROGRESS ? "=>" : "<=",\r
@@ -5662,7 +5662,7 @@ onig_builtin_monitor(OnigCalloutArgs* args, void* user_data)
           (int )(right   - string),\r
           (int )(strend  - string));\r
   //fflush(fp);\r
-\r
+*/\r
   return ONIG_CALLOUT_SUCCESS;\r
 }\r
 \r

diff --git a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
index 07bc02e097a8f5687de7e7cbf045e86455545d2e..da50092cd22f799d49d0adf0431a7ff19b7916e0 100644 (file)
--- a/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
+++ b/MdeModulePkg/Universal/RegularExpressionDxe/RegularExpressionDxe.inf
@@ -107,8 +107,5 @@
   # Oniguruma: signed and unsigned mismatch/cast\r
   MSFT:*_*_*_CC_FLAGS = /wd4018 /wd4245 /wd4389\r
 \r
-  # Oniguruma: error: variable 'fp' set but not used\r
-  GCC:*_*_*_CC_FLAGS = -Wno-error=unused-but-set-variable\r
-\r
   # Oniguruma: tag_end in parse_callout_of_name\r
   GCC:*_*_*_CC_FLAGS = -Wno-error=maybe-uninitialized\r