summaryrefslogtreecommitdiff
path: root/compat/regex
diff options
context:
space:
mode:
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>2010-08-19 18:30:01 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-08-19 20:00:44 (GMT)
commitb50f37098fcf7efb097c01daa3d60df8b9704025 (patch)
tree13cf3d4ae4662badd0b3a83ce2767830741e4113 /compat/regex
parentde831726decd9c2fcaf7c71136560cf6f5c38a59 (diff)
downloadgit-b50f37098fcf7efb097c01daa3d60df8b9704025.zip
git-b50f37098fcf7efb097c01daa3d60df8b9704025.tar.gz
git-b50f37098fcf7efb097c01daa3d60df8b9704025.tar.bz2
compat/regex: define out variables only used under RE_ENABLE_I18N
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 <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/regex')
-rw-r--r--compat/regex/regex_internal.c2
-rw-r--r--compat/regex/regexec.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/compat/regex/regex_internal.c b/compat/regex/regex_internal.c
index dad17a8..193854c 100644
--- 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
index aee502d..0c2b054 100644
--- 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)