compat/regex: define out variables only used under RE_ENABLE_I18N

avar · gitster · commit b50f37098fcf · 2010-08-19T13:00:44.000-07:00
Wrap variables that were only used RE_ENABLE_I18N in `#ifdef
RE_ENABLE_I18N`. This eliminates compiler warnings when compiling with
NO_REGEX=YesPlease.

Signed-off-by: Ævar Arnfjörð Bjarmason &lt;avarab@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
@@ -692,10 +692,10 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)
 	}
       else
 	{
+#ifdef RE_ENABLE_I18N
 	  /* No, skip all characters until IDX.  */
 	  int prev_valid_len = pstr->valid_len;
 
-#ifdef RE_ENABLE_I18N
 	  if (BE (pstr->offsets_needed, 0))
 	    {
 	      pstr->len = pstr->raw_len - idx + offset;
diff --git a/compat/regex/regexec.c b/compat/regex/regexec.c
@@ -3059,7 +3059,9 @@ check_arrival_add_next_nodes (re_match_context_t *mctx, int str_idx,
   const re_dfa_t *const dfa = mctx->dfa;
   int result;
   int cur_idx;
+#ifdef RE_ENABLE_I18N
   reg_errcode_t err = REG_NOERROR;
+#endif
   re_node_set union_set;
   re_node_set_init_empty (&union_set);
   for (cur_idx = 0; cur_idx < cur_nodes->nelem; ++cur_idx)

Original file line number	Diff line number	Diff line change
`@@ -692,10 +692,10 @@ re_string_reconstruct (re_string_t *pstr, int idx, int eflags)`
`692`	`692`	`}`
`693`	`693`	`else`
`694`	`694`	`{`
	`695`	`+#ifdef RE_ENABLE_I18N`
`695`	`696`	`/* No, skip all characters until IDX. */`
`696`	`697`	`int prev_valid_len = pstr->valid_len;`
`697`	`698`
`698`		`-#ifdef RE_ENABLE_I18N`
`699`	`699`	`if (BE (pstr->offsets_needed, 0))`
`700`	`700`	`{`
`701`	`701`	`pstr->len = pstr->raw_len - idx + offset;`